From 8276673bae999c3e74d71c81ca84842ed1365c89 Mon Sep 17 00:00:00 2001
From: Servo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com>
Date: Sun, 22 Sep 2024 03:24:38 +0200
Subject: [PATCH] Update web-platform-tests to revision
 b'8e164c249d2b93a4234a2710a5e2cc5a16fab499' (#33515)

Signed-off-by: WPT Sync Bot <ghbot+wpt-sync@servo.org>
---
 ...g_curves_bits_curve25519.https.any.js.ini} |   34 +-
 ...cfrg_curves_bits_curve448.https.any.js.ini |   38 +
 ...g_curves_keys_curve25519.https.any.js.ini} |   46 +-
 ...cfrg_curves_keys_curve448.https.any.js.ini |   44 +
 .../WebCryptoAPI/getRandomValues.any.js.ini   |   48 -
 .../okp_importKey.https.any.js.ini            |  698 --
 .../okp_importKey_Ed25519.https.any.js.ini    |  188 +
 .../okp_importKey_Ed448.https.any.js.ini      |  188 +
 .../okp_importKey_X25519.https.any.js.ini     |  164 +
 .../okp_importKey_X448.https.any.js.ini       |  164 +
 .../sign_verify/eddsa.https.any.js.ini        |  242 -
 .../eddsa_curve25519.https.any.js.ini         |   80 +
 .../eddsa_curve448.https.any.js.ini           |   80 +
 ...okies-a-b-a-embed.tentative.https.html.ini |    3 +
 .../new-fc-beside-adjoining-float-2.html.ini  |    2 -
 .../new-fc-beside-adjoining-float.html.ini    |    2 -
 .../margin-collapse-113.xht.ini               |    3 -
 .../margin-collapse-min-height-001.xht.ini    |    2 -
 ...d-color-animation-custom-property.html.ini |    2 +
 ...on-custom-timing-function-reverse.html.ini |    2 +
 ...-animation-custom-timing-function.html.ini |    2 +
 .../css/css-box/parsing/height-valid.html.ini |    9 -
 .../css-box/parsing/max-height-valid.html.ini |    9 -
 .../css-box/parsing/max-width-valid.html.ini  |    9 -
 .../css/css-box/parsing/width-valid.html.ini  |    9 -
 ...ntative.html.ini => scope-shadow.html.ini} |    2 +-
 ...entcolor-visited-getcomputedstyle.html.ini |    3 +
 .../at-container-overflowing-parsing.html.ini |    2 +
 ...ntainer-overflowing-serialization.html.ini |    2 +
 .../scroll-state-snapped-none.html.ini        |    2 +
 .../negative-overflow-003.html.ini            |  144 +
 .../parsing/flex-basis-computed.html.ini      |    9 -
 .../parsing/flex-basis-valid.html.ini         |    9 -
 .../parsing/flex-shorthand.html.ini           |   24 -
 .../generic-family-keywords-001.html.ini      |    5 +-
 .../object-position-interpolation.html.ini    |  252 -
 .../css/css-images/inheritance.html.ini       |   13 -
 .../parsing/object-fit-computed.html.ini      |   16 -
 .../parsing/object-fit-valid.html.ini         |   16 -
 .../parsing/object-position-computed.html.ini |   49 -
 .../parsing/object-position-valid.html.ini    |   55 -
 .../parsing/block-size-valid.html.ini         |    6 -
 .../parsing/inline-size-valid.html.ini        |    6 -
 .../parsing/max-block-size-computed.html.ini  |    6 -
 .../parsing/max-block-size-valid.html.ini     |    6 -
 .../parsing/max-inline-size-computed.html.ini |    6 -
 .../parsing/max-inline-size-valid.html.ini    |    6 -
 .../parsing/min-block-size-computed.html.ini  |    6 -
 .../parsing/min-block-size-valid.html.ini     |    6 -
 .../parsing/min-inline-size-computed.html.ini |    6 -
 .../parsing/min-inline-size-valid.html.ini    |    6 -
 .../clip-path/clip-path-rect-004.html.ini     |    2 +
 .../line-clamp-auto-035.tentative.html.ini    |    2 +
 .../line-clamp-auto-036.tentative.html.ini    |    2 +
 .../line-clamp-auto-037.tentative.html.ini    |    2 +
 .../animation/height-composition.html.ini     |   15 -
 .../animation/height-interpolation.html.ini   |  300 -
 .../max-height-interpolation.html.ini         |  198 -
 .../max-width-interpolation.html.ini          |  198 -
 .../min-height-interpolation.html.ini         |  132 -
 .../min-width-interpolation.html.ini          |  198 -
 .../animation/width-composition.html.ini      |   15 -
 .../animation/width-interpolation.html.ini    |  300 -
 ...k-size-with-min-or-max-content-1a.html.ini |    2 -
 ...k-size-with-min-or-max-content-1b.html.ini |    2 -
 .../dynamic-available-size-iframe.html.ini    |    2 +
 ...tainer-with-min-or-max-content-2a.html.ini |    2 -
 ...tainer-with-min-or-max-content-2b.html.ini |    2 -
 .../intrinsic-percent-replaced-021.html.ini   |    2 +
 .../intrinsic-percent-replaced-022.html.ini   |    2 +
 .../intrinsic-percent-replaced-023.html.ini   |    2 +
 .../css-sizing/parsing/height-valid.html.ini  |    6 -
 .../parsing/max-height-computed.html.ini      |    6 -
 .../parsing/max-height-valid.html.ini         |    6 -
 .../parsing/max-width-computed.html.ini       |    6 -
 .../parsing/max-width-valid.html.ini          |    6 -
 .../parsing/min-height-computed.html.ini      |    6 -
 .../parsing/min-height-valid.html.ini         |    6 -
 .../parsing/min-width-computed.html.ini       |    6 -
 .../parsing/min-width-valid.html.ini          |    6 -
 .../css-sizing/parsing/width-valid.html.ini   |    6 -
 ...tainer-with-min-or-max-content-2a.html.ini |    2 -
 .../css/css-text-decor/inheritance.html.ini   |    3 +
 .../text-emphasis-position-computed.html.ini  |    3 +
 .../text-emphasis-position-valid.html.ini     |   15 +
 .../letter-spacing-trim-start-002.html.ini    |    3 -
 .../white-space-intrinsic-size-021.html.ini   |   45 +-
 ...terpolate-size-height-composition.html.ini |   30 -
 ...rpolate-size-height-interpolation.html.ini |  426 --
 ...-logical-properties-interpolation.html.ini |   69 -
 ...ate-size-max-height-interpolation.html.ini |  156 -
 ...late-size-max-width-interpolation.html.ini |  156 -
 ...ate-size-min-height-interpolation.html.ini |  138 -
 ...late-size-min-width-interpolation.html.ini |  204 -
 .../interpolate-size-which-value.html.ini     |    3 +
 ...nterpolate-size-width-composition.html.ini |   30 -
 ...erpolate-size-width-interpolation.html.ini |  372 -
 .../vh_not_refreshing_on_chrome.html.ini      |    1 +
 ...ryList-addListener-removeListener.html.ini |    3 +
 .../dom/events/CustomEvent.html.ini           |    5 -
 .../dom/idlharness.any.js.ini                 |    3 -
 .../dom/idlharness.window.js.ini              |    3 -
 .../tentative/observable-from.any.js.ini      |   96 +
 .../gb18030/gb18030-decoder.any.js.ini        |  108 -
 .../gbk/gbk-encoder.html.ini                  |  110 +
 .../createImageBitmap-flipY.html.ini          |    2 +-
 ....size.attributes.parse.minus.worker.js.ini |    1 +
 .../2d.canvas.host.size.large.worker.js.ini   |    2 +
 ...nitiator-is-not-opener.https.window.js.ini |    1 -
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 ...losed-listbox-rendering.tentative.html.ini |    0
 .../option-computed-style.tentative.html.ini  |    0
 ...ct-datalist-options-idl.tentative.html.ini |    9 -
 .../select-parsing.tentative.html.ini         |    8 +-
 ...ectedoptionelement-attr.tentative.html.ini |    0
 .../border-rendering.tentative.html.ini       |    2 -
 .../parsing/DOMContentLoaded-defer.html.ini   |    3 -
 .../event-handler-all-global-events.html.ini  |   36 +
 ...nt-handler-attributes-body-window.html.ini |  117 +
 ...andler-attributes-frameset-window.html.ini |   66 +
 .../charset-parameter.window.js.ini           |   48 +
 .../mimesniff/mime-types/parsing.any.js.ini   | 6506 +++++++++++++++++
 .../mimesniff/sniffing/html.window.js.ini     |    6 +
 .../test-navigation-type-reload.html.ini      |    9 +
 .../excluded-properties-002.html.ini          |    3 -
 .../webmessaging/with-ports/017.html.ini      |    4 -
 .../semantics/run-a-worker/003.html.ini       |    1 +
 tests/wpt/meta/MANIFEST.json                  | 4364 +++++++++--
 ...g_curves_bits_curve25519.https.any.js.ini} |   34 +-
 ...cfrg_curves_bits_curve448.https.any.js.ini |   38 +
 ...g_curves_keys_curve25519.https.any.js.ini} |   46 +-
 ...cfrg_curves_keys_curve448.https.any.js.ini |   44 +
 .../okp_importKey.https.any.js.ini            |  698 --
 .../okp_importKey_Ed25519.https.any.js.ini    |  188 +
 .../okp_importKey_Ed448.https.any.js.ini      |  188 +
 .../okp_importKey_X25519.https.any.js.ini     |  164 +
 .../okp_importKey_X448.https.any.js.ini       |  164 +
 .../sign_verify/eddsa.https.any.js.ini        |  242 -
 .../eddsa_curve25519.https.any.js.ini         |   80 +
 .../eddsa_curve448.https.any.js.ini           |   80 +
 ...okies-a-b-a-embed.tentative.https.html.ini |    3 +
 ...d-color-animation-custom-property.html.ini |    2 +
 ...on-custom-timing-function-reverse.html.ini |    2 +
 ...-animation-custom-timing-function.html.ini |    2 +
 ...ntative.html.ini => scope-shadow.html.ini} |    2 +-
 ...entcolor-visited-getcomputedstyle.html.ini |    3 +
 .../at-container-overflowing-parsing.html.ini |    2 +
 ...ntainer-overflowing-serialization.html.ini |    2 +
 .../scroll-state-snapped-none.html.ini        |    2 +
 .../negative-overflow-003.html.ini            |  144 +
 .../css-overflow/incremental-scroll.html.ini  |    2 -
 .../line-clamp-auto-035.tentative.html.ini    |    2 +
 .../line-clamp-auto-036.tentative.html.ini    |    2 +
 .../line-clamp-auto-037.tentative.html.ini    |    2 +
 .../intrinsic-percent-replaced-022.html.ini   |    2 +
 .../intrinsic-percent-replaced-023.html.ini   |    2 +
 .../css/css-text-decor/inheritance.html.ini   |    3 +
 .../text-emphasis-position-computed.html.ini  |    3 +
 .../text-emphasis-position-valid.html.ini     |   15 +
 ...yList-extends-EventTarget-interop.html.ini |    3 -
 .../tentative/observable-from.any.js.ini      |   96 +
 .../gb18030/gb18030-decoder.any.js.ini        |  108 -
 .../gbk/gbk-encoder.html.ini                  |  110 +
 .../createImageBitmap-invalid-args.html.ini   |    2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    1 -
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 ...losed-listbox-rendering.tentative.html.ini |    0
 .../option-computed-style.tentative.html.ini  |    0
 ...ct-datalist-options-idl.tentative.html.ini |    9 -
 .../select-parsing.tentative.html.ini         |    8 +-
 ...ectedoptionelement-attr.tentative.html.ini |    0
 .../border-rendering.tentative.html.ini       |    2 -
 .../event-handler-all-global-events.html.ini  |   36 +
 ...nt-handler-attributes-body-window.html.ini |  117 +
 ...andler-attributes-frameset-window.html.ini |   66 +
 .../child-document-raf-order.html.ini         |    3 +
 ...nested-context-navigations-iframe.html.ini |   19 -
 .../Worker/Worker-constructor.html.ini        |    2 +
 .../.github/workflows/check-workflow-run.yml  |   22 +-
 .../tests/.github/workflows/safari_stable.yml |    7 +-
 .../workflows/safari_technology_preview.yml   |    7 +-
 ...-partition-navigation.tentative.https.html |    4 +-
 .../derive_bits_keys/cfrg_curves_bits.js      |   48 +-
 .../cfrg_curves_bits_curve25519.https.any.js  |   10 +
 ...=> cfrg_curves_bits_curve448.https.any.js} |    4 +-
 .../cfrg_curves_bits_fixtures.js              |    3 +
 .../derive_bits_keys/cfrg_curves_keys.js      |   51 +-
 .../cfrg_curves_keys_curve25519.https.any.js  |   10 +
 ...=> cfrg_curves_keys_curve448.https.any.js} |    2 +-
 .../import_export/okp_importKey.https.any.js  |  280 -
 .../import_export/okp_importKey.js            |  209 +
 .../okp_importKey_Ed25519.https.any.js        |    9 +
 .../okp_importKey_Ed448.https.any.js          |    9 +
 .../okp_importKey_X25519.https.any.js         |    9 +
 .../okp_importKey_X448.https.any.js           |    9 +
 .../import_export/okp_importKey_fixtures.js   |   58 +
 .../tests/WebCryptoAPI/sign_verify/eddsa.js   |    4 +-
 .../sign_verify/eddsa_curve25519.https.any.js |    6 +
 ...tps.any.js => eddsa_curve448.https.any.js} |    2 +-
 .../WebCryptoAPI/sign_verify/eddsa_vectors.js |    6 +-
 tests/wpt/tests/compute-pressure/README.md    |   61 +-
 ...=> compute_pressure_basic.https.window.js} |   76 +-
 .../compute-pressure/resources/common.js      |  141 +
 .../resources/worker-support.js               |   48 +
 ...avascript-parent-initiated-parent-csp.html |    7 +-
 ...d-cookies-a-b-a-embed.tentative.https.html |   43 +
 .../ancestor-chain-cross-site-embed.html      |   31 +
 .../ancestor-chain-same-site-embed.html       |   19 +
 ...d-color-animation-custom-property-ref.html |   15 +
 ...round-color-animation-custom-property.html |   54 +
 ...-animation-custom-timing-function-ref.html |   15 +
 ...on-custom-timing-function-reverse-ref.html |   15 +
 ...mation-custom-timing-function-reverse.html |   52 +
 ...olor-animation-custom-timing-function.html |   51 +
 ...mage-in-fragmented-flexbox-001-crash.html} |    0
 ...mage-in-fragmented-flexbox-002-crash.html} |    0
 ...> grid-item-placement-multiple-crash.html} |    0
 ... nested-fixedpos-in-inline-000-crash.html} |    0
 ... nested-fixedpos-in-inline-001-crash.html} |    0
 ... nested-fixedpos-in-inline-002-crash.html} |    0
 ...ticol-with-spanner-and-oof-001-crash.html} |    0
 ...ticol-with-spanner-and-oof-002-crash.html} |    0
 ...ticol-with-spanner-and-oof-003-crash.html} |    0
 ...ticol-with-spanner-and-oof-004-crash.html} |    0
 ...ticol-with-spanner-and-oof-005-crash.html} |    0
 ...ticol-with-spanner-and-oof-006-crash.html} |    0
 ...ticol-with-spanner-and-oof-007-crash.html} |    0
 ...ticol-with-spanner-and-oof-008-crash.html} |    0
 ...hadow.tentative.html => scope-shadow.html} |    2 -
 .../color-scheme-link-crash.html              |   10 +
 .../parsing/color-valid-relative-color.html   |    4 -
 ...currentcolor-visited-getcomputedstyle.html |   23 +
 .../at-container-overflowing-parsing.html     |   34 +
 ...t-container-overflowing-serialization.html |   32 +
 .../at-container-parsing.html                 |  233 +-
 .../at-container-snapped-parsing.html         |   83 +-
 .../at-container-stuck-parsing.html           |   93 +-
 .../at-container-style-parsing.html           |   73 +-
 .../scroll-state-snapped-none.html            |   27 +
 .../support/cq-testcommon.js                  |   68 +
 .../css-flexbox/negative-overflow-003.html    |   73 +
 .../text-box-trim-accumulation-001.html       |    2 +-
 ...x-trim-half-leading-block-box-001-ref.html |    6 +-
 .../text-box-trim-height-002-ref.html         |    6 +-
 .../text-box-trim-height-002.html             |    5 +-
 ...box-trim-initial-letter-start-001-ref.html |    4 +-
 ...t.html => clip-path-transition-crash.html} |    0
 .../clip-path/clip-path-rect-004.html         |   29 +
 .../nested-declarations-cssom.html            |   27 +-
 .../css/css-overflow/incremental-scroll.html  |    2 +-
 .../line-clamp/line-clamp-auto-001-crash.html |   20 +
 .../line-clamp-auto-035.tentative.html        |   29 +
 .../line-clamp-auto-036.tentative.html        |   32 +
 .../line-clamp-auto-037.tentative.html        |   23 +
 .../reference/line-clamp-auto-032-ref.html    |    2 +-
 .../reference/line-clamp-auto-036-ref.html    |   23 +
 .../css/css-shadow-parts/host-part-002.html   |   48 +
 .../css/css-shadow-parts/multiple-scopes.html |   88 +
 .../aspect-ratio/block-aspect-ratio-058.html  |   33 +
 .../intrinsic-percent-replaced-017.html       |    2 +-
 .../intrinsic-percent-replaced-021.html       |   25 +
 .../intrinsic-percent-replaced-022.html       |   27 +
 .../intrinsic-percent-replaced-023.html       |   28 +
 .../tests/css/css-text-decor/inheritance.html |    2 +-
 .../text-emphasis-position-computed.html      |    1 +
 .../text-emphasis-position-invalid.html       |   15 +
 .../parsing/text-emphasis-position-valid.html |   15 +
 .../text-emphasis-position-auto-001-ref.html  |   39 +
 .../text-emphasis-position-auto-001.html      |   42 +
 .../css/css-values/calc-invalid-parsing.html  |    2 +
 .../element-is-grouping-during-animation.html |    3 +
 .../layered-capture/nested-opacity-ref.html   |   26 +
 ...apture-observable-when-flat.tentative.html |   44 +
 .../layered-capture/tree-effects-ref.sub.html |   39 +
 .../tree-effects.tentative.sub.html           |   73 +
 ...ransition-iframe-with-startVT-on-main.html |    4 +-
 ...plicit-name-nested-vt-names.tentative.html |    2 +
 .../nested/nested-opacity-ref.html            |   26 +
 ...ity-backdrop-blend-animated.tentative.html |   45 +
 .../opacity-backdrop-blend.tentative.html     |   41 +
 .../opacity-computed-style.tentative.html     |   50 +
 .../opacity-resets-after-done.tentative.html  |   45 +
 .../opacity-resets-after-skip.tentative.html  |   41 +
 .../nested/resources/compute-test.js          |    3 +
 .../new-and-old-sizes-match.html              |    2 +-
 .../new-content-captures-different-size.html  |    7 +-
 .../old-content-captures-different-size.html  |    2 +-
 ...ransform-origin-view-transition-group.html |    1 +
 .../tests/css/css-viewport/zoom/widget.html   |   19 +
 .../table-progression-htb-002.html            |    2 +-
 ...https.html => create.tentative.https.html} |   34 +-
 .../default-permissions-policy.https.sub.html |    2 +-
 ...abled-by-permissions-policy.https.sub.html |    2 +-
 ...rigin-by-permissions-policy.https.sub.html |    2 +-
 .../get-user-activation.https.html            |   10 +-
 ...ve.https.html => get.tentative.https.html} |   45 +-
 .../digital-credentials/historical.any.js     |    3 +
 .../digital-credentials/support/helper.js     |    4 +-
 .../digital-credentials/support/iframe.html   |    8 +-
 .../tests/docs/writing-tests/testdriver.md    |    7 +
 .../display-mode.https.html                   |   12 +-
 .../tentative/observable-from.any.js          |  581 +-
 ...in-svg-followed-by-collapsible-spaces.html |    1 +
 tests/wpt/tests/editing/data/indent.js        |  267 +-
 .../gb18030/gb18030-decoder.any.js            |   36 +-
 .../gb18030/gb18030-encoder.html              |   36 +-
 .../legacy-mb-schinese/gbk/gbk-decoder.any.js |    2 +
 .../legacy-mb-schinese/gbk/gbk-encoder.html   |   39 +
 ...-silent-mediation-not-permitted.https.html |   23 +
 ...uest-constructor-init-body-override.any.js |   16 +
 ...stemBaseHandle-IndexedDB-manual.https.html |    4 +-
 ...Message-BroadcastChannel-manual.https.html |    4 +-
 ...Handle-postMessage-Error-manual.https.html |    6 +-
 ...ssage-MessagePort-frames-manual.https.html |    6 +-
 ...sage-MessagePort-windows-manual.https.html |    9 +-
 ...sage-MessagePort-workers-manual.https.html |   12 +-
 ...andle-postMessage-frames-manual.https.html |    9 +-
 ...ndle-postMessage-windows-manual.https.html |    9 +-
 ...ndle-postMessage-workers-manual.https.html |   12 +-
 .../resources/local-fs-test-helpers.js        |   34 +-
 .../tentative/resources/ba-fledge-util.sub.js |    5 +-
 .../tentative/server-response.https.window.js |  500 +-
 .../fs/resources/messaging-blob-helpers.js    |   12 +-
 .../tests/fs/resources/messaging-helpers.js   |    9 +-
 .../fs/resources/sandboxed-fs-test-helpers.js |   34 +-
 .../FileSystemBaseHandle-IndexedDB.js         |    3 +-
 .../history-traversal/same-url.html           |   11 +-
 .../resources/executor-window.py              |    8 +-
 tests/wpt/tests/html/canvas/color.window.js   |   72 +
 tests/wpt/tests/html/meta/refresh-time.html   |   56 +-
 .../tests/html/meta/resources/refresh.99.html |    5 -
 .../meta/resources/refresh1dotdot5dot.html    |    5 -
 .../meta/resources/refresh1dotdot9dot.html    |    5 +
 .../iframe-loading-lazy-simple-crash.html     |    5 +
 ...arance-base-select-other-elements-ref.html |    0
 ...-base-select-other-elements.tentative.html |    0
 .../closed-listbox-rendering-ref.html         |    0
 .../closed-listbox-rendering.tentative.html   |    0
 .../nested-options.tenative.html              |    0
 .../option-computed-style.tentative.html      |    0
 ...ibility-minimum-target-size.tentative.html |    0
 ...select-datalist-options-idl.tentative.html |    0
 .../select-disabled.tentative.html            |    0
 ...allback-datalist-animations.tentative.html |    0
 .../select-keyboard-behavior.tentative.html   |    0
 .../select-mouse-behavior.tentative.html      |    0
 .../select-option-hover-styles.tentative.html |    0
 .../select-parsing.tentative.html             |    0
 .../select-size-multiple-new-content-ref.html |    0
 ...t-size-multiple-new-content.tentative.html |    0
 .../selectedoption.tentative.html             |    0
 .../selectedoptionelement-attr.tentative.html |    0
 .../switch-picker-appearance.tentative.html   |    0
 .../stylable-select/border-rendering-ref.html |   18 -
 .../border-rendering.tentative.html           |   14 -
 ...lect-keyboard-hidden-option.tentative.html |   48 -
 .../event-handler-all-global-events.html      |   14 +-
 .../events/resources/event-handler-body.js    |   16 +
 .../tests/interfaces/digital-credentials.idl  |   10 +-
 tests/wpt/tests/interfaces/mediaqueries-5.idl |   30 +
 tests/wpt/tests/interfaces/webauthn.idl       |    2 +-
 tests/wpt/tests/interfaces/webhid.idl         |   10 +-
 tests/wpt/tests/interfaces/webnn.idl          |    2 +-
 tests/wpt/tests/interfaces/webtransport.idl   |    2 +
 .../MediaStreamTrack-getSettings.https.html   |   51 +-
 .../tests/nav-tracking-mitigations/META.yml   |    9 +
 ...redirect-with-cookie-header.sub.https.html |   15 +
 ...-with-cookie-header.sub.https.html.headers |    2 +
 .../cross-origin-get-cookie.sub.https.html    |    5 +
 .../redirect-chain-end.sub.https.html         |   10 +
 .../redirect-chain-start.sub.https.html       |   18 +
 .../stateful-client-bounce.sub.https.html     |   69 +
 ...oss-origin-nested.tentative.https.sub.html |   77 +
 ...gin-serviceworker.tentative.https.sub.html |   36 +
 .../notifications/permissions-non-secure.html |    6 +
 .../cross-origin-nested-child.sub.html        |    9 +
 .../cross-origin-nested-parent.sub.html       |   24 +
 ...cross-origin-serviceworker-iframe.sub.html |   24 +
 .../resources/permission-helper.js            |   24 +
 .../notifications/resources/permission-sw.js  |   19 +
 .../resources/permission-worker.js            |    4 +
 .../partitioned-popins.close.html.headers     |    1 +
 .../partitioned-popins.cookies-popin.py       |    1 +
 ...ned-popins.localStorage-popin.html.headers |    1 +
 ...oned-popins.permissions-popin.html.headers |    1 +
 ...artitioned-popins.proxy-popin.html.headers |    1 +
 .../partitioned-popins.recursive.html.headers |    1 +
 .../partitioned-popins.request-header.http.py |    1 +
 ...rtitioned-popins.request-header.initial.py |    1 +
 .../partitioned-popins.request-header.js.py   |    1 +
 .../partitioned-popins.wait.html.headers      |    1 +
 .../resources/popinContextType.html.headers   |    1 +
 .../popinContextTypesSupported.html.headers   |    1 +
 .../resources/digital-credentials-get.html    |    2 +-
 .../permissions-policy-hid-worker.html        |   10 +
 .../permissions-policy-hid-worker.js          |   14 +
 .../resources/permissions-policy-hid.html     |    9 +
 .../wpt/tests/png/support/cicp-display-p3.png |  Bin 143 -> 143 bytes
 ...resentationConnectionCloseEvent.https.html |    2 +-
 tests/wpt/tests/remote-playback/META.yml      |    2 +-
 .../wpt/tests/resources/testdriver-actions.js |    2 +-
 tests/wpt/tests/resources/testdriver.js       |   95 +-
 ...lection-direction-on-clicks.tentative.html |   78 +
 .../tentative/Selection-direction.html}       |    0
 .../tentative/dom-mutation.html               |   66 +
 tests/wpt/tests/tools/ci/tc/tasks/test.yml    |    4 +-
 .../wpt/tests/tools/ci/tc/tests/test_valid.py |   26 -
 .../webdriver/webdriver/bidi/transport.py     |    4 +-
 .../tests/tools/webdriver/webdriver/client.py |   24 +
 .../browsers/webkitgtk_minibrowser.py         |    1 -
 .../wptrunner/wptrunner/executors/actions.py  |   41 +-
 .../wptrunner/executors/executorchrome.py     |  103 +-
 .../wptrunner/executors/executormarionette.py |   18 +-
 .../wptrunner/executors/executorwebdriver.py  |  122 +-
 .../wptrunner/wptrunner/executors/protocol.py |   18 +
 .../wptrunner/wptrunner/testdriver-extra.js   |   18 +-
 .../tools/wptrunner/wptrunner/testloader.py   |   30 +-
 .../tools/wptrunner/wptrunner/testrunner.py   |    3 +-
 .../wptrunner/wptrunner/wptcommandline.py     |    3 +
 .../webauthn/getclientcapabilities.https.html |   33 +
 tests/wpt/tests/webcodecs/README.md           |    6 +
 .../webcodecs/audio-decoder.https.any.js      |   63 +-
 .../audioDecoder-codec-specific.https.any.js  |   18 +
 tests/wpt/tests/webcodecs/sfx.flac            |  Bin 0 -> 13123 bytes
 .../webcodecs/video-decoder.https.any.js      |   42 +-
 .../tests/webdriver/tests/bidi/__init__.py    |   29 +-
 .../browsing_context/set_viewport/viewport.py |   18 +-
 .../traverse_history/context.py               |   27 -
 .../traverse_history/invalid.py               |   18 +
 .../input/perform_actions/pointer_mouse.py    |   59 +
 .../webdriver/tests/bidi/network/__init__.py  |   63 +-
 .../network/auth_required/auth_required.py    |   48 +
 .../before_request_sent.py                    |  106 +-
 .../bidi/network/fetch_error/fetch_error.py   |   37 +
 .../response_completed/response_completed.py  |  123 +-
 .../response_started/response_started.py      |  123 +-
 .../classic/perform_actions/pointer_mouse.py  |   49 +-
 ...-attribute-redirect-on-load.https.sub.html |   44 +
 ...ermissions-policy-attribute.https.sub.html |   46 +
 ...lowed-by-permissions-policy.https.sub.html |   46 +
 ...-permissions-policy.https.sub.html.headers |    1 +
 ...ttps.window.js => idlharness.https.any.js} |    7 +-
 ...id-allowed-by-permissions-policy-worker.js |   14 +
 ...d-disabled-by-permissions-policy-worker.js |   17 +
 .../webnn/conformance_tests/abs.https.any.js  |   32 +-
 .../webnn/conformance_tests/add.https.any.js  |   72 +-
 .../arg_min_max.https.any.js                  |   72 +-
 .../batch_normalization.https.any.js          |  115 +-
 .../byob_readtensor.https.any.js              |    6 +-
 .../webnn/conformance_tests/cast.https.any.js |  188 +-
 .../webnn/conformance_tests/ceil.https.any.js |   32 +-
 .../conformance_tests/clamp.https.any.js      |   83 +-
 ...rview-with-bigger-arraybuffer.https.any.js |    4 +-
 .../conformance_tests/concat.https.any.js     |  352 +-
 .../conformance_tests/conv2d.https.any.js     |  129 +-
 .../conv_transpose2d.https.any.js             |  134 +-
 .../webnn/conformance_tests/cos.https.any.js  |   28 +-
 .../dequantizeLinear.https.any.js             |   24 +-
 .../webnn/conformance_tests/div.https.any.js  |   60 +-
 .../webnn/conformance_tests/elu.https.any.js  |   51 +-
 .../conformance_tests/equal.https.any.js      |   73 +-
 .../webnn/conformance_tests/erf.https.any.js  |   28 +-
 .../webnn/conformance_tests/exp.https.any.js  |   28 +-
 .../conformance_tests/expand.https.any.js     |   88 +-
 .../conformance_tests/floor.https.any.js      |   32 +-
 .../conformance_tests/gather.https.any.js     |  132 +-
 .../gatherElements.https.any.js               |   18 +-
 .../conformance_tests/gatherND.https.any.js   |  182 +
 .../webnn/conformance_tests/gelu.https.any.js |   63 +-
 .../webnn/conformance_tests/gemm.https.any.js |  203 +-
 .../conformance_tests/greater.https.any.js    |   73 +-
 .../greater_or_equal.https.any.js             |   73 +-
 .../webnn/conformance_tests/gru.https.any.js  |  132 +-
 .../conformance_tests/gru_cell.https.any.js   |   56 +-
 .../hard_sigmoid.https.any.js                 |   71 +-
 .../conformance_tests/hard_swish.https.any.js |   39 +-
 .../conformance_tests/identity.https.any.js   |   28 +-
 .../inputs-are-not-modified.https.any.js      |   14 +-
 .../instance_normalization.https.any.js       |   36 +-
 .../layer_normalization.https.any.js          |   56 +-
 .../conformance_tests/leaky_relu.https.any.js |   51 +-
 .../conformance_tests/lesser.https.any.js     |   73 +-
 .../lesser_or_equal.https.any.js              |   73 +-
 .../conformance_tests/linear.https.any.js     |   63 +-
 .../webnn/conformance_tests/log.https.any.js  |   28 +-
 .../logical_not.https.any.js                  |   28 +-
 .../webnn/conformance_tests/lstm.https.any.js |  192 +-
 .../conformance_tests/lstm_cell.https.any.js  |   94 +-
 .../conformance_tests/matmul.https.any.js     |   64 +-
 .../webnn/conformance_tests/max.https.any.js  |   60 +-
 .../webnn/conformance_tests/min.https.any.js  |   60 +-
 .../webnn/conformance_tests/mul.https.any.js  |   60 +-
 .../webnn/conformance_tests/neg.https.any.js  |   32 +-
 .../webnn/conformance_tests/pad.https.any.js  |   44 +-
 .../parallel-compute.https.any.js             |    2 +-
 .../parallel-dispatch.https.any.js            |   18 +-
 .../conformance_tests/pooling.https.any.js    |  184 +-
 .../webnn/conformance_tests/pow.https.any.js  |   67 +-
 .../conformance_tests/prelu.https.any.js      |   83 +-
 .../quantizeLinear.https.any.js               |   24 +-
 .../conformance_tests/reciprocal.https.any.js |   28 +-
 .../conformance_tests/reduce_l1.https.any.js  |   84 +-
 .../conformance_tests/reduce_l2.https.any.js  |   76 +-
 .../reduce_log_sum.https.any.js               |   68 +-
 .../reduce_log_sum_exp.https.any.js           |   76 +-
 .../conformance_tests/reduce_max.https.any.js |   64 +-
 .../reduce_mean.https.any.js                  |   76 +-
 .../conformance_tests/reduce_min.https.any.js |   64 +-
 .../reduce_product.https.any.js               |   64 +-
 .../conformance_tests/reduce_sum.https.any.js |   84 +-
 .../reduce_sum_square.https.any.js            |   96 +-
 .../webnn/conformance_tests/relu.https.any.js |   39 +-
 .../conformance_tests/resample2d.https.any.js |   52 +-
 .../conformance_tests/reshape.https.any.js    |  138 +-
 .../conformance_tests/scatterND.https.any.js  |  100 +
 .../conformance_tests/sigmoid.https.any.js    |   40 +-
 .../webnn/conformance_tests/sign.https.any.js |   28 +-
 .../webnn/conformance_tests/sin.https.any.js  |   28 +-
 .../conformance_tests/slice.https.any.js      |   24 +-
 .../conformance_tests/softmax.https.any.js    |   36 +-
 .../conformance_tests/softplus.https.any.js   |   39 +-
 .../conformance_tests/softsign.https.any.js   |   47 +-
 .../conformance_tests/split.https.any.js      |  137 +-
 .../webnn/conformance_tests/sqrt.https.any.js |   28 +-
 .../webnn/conformance_tests/sub.https.any.js  |   60 +-
 .../conformance_tests/subgraph.https.any.js   | 2475 +++++++
 .../webnn/conformance_tests/tan.https.any.js  |   28 +-
 .../webnn/conformance_tests/tanh.https.any.js |   25 +-
 .../conformance_tests/tensor.https.any.js     |   89 +-
 .../webnn/conformance_tests/tile.https.any.js |   12 +-
 .../conformance_tests/transpose.https.any.js  |   44 +-
 .../conformance_tests/triangular.https.any.js |   64 +-
 .../conformance_tests/where.https.any.js      |  178 +-
 tests/wpt/tests/webnn/idlharness.https.any.js |    6 +-
 tests/wpt/tests/webnn/resources/utils.js      |  255 +-
 .../tests/webnn/resources/utils_validation.js |  154 +-
 .../validation_tests/argMinMax.https.any.js   |   28 +-
 .../batchNormalization.https.any.js           |  141 +-
 .../build-more-than-once.https.any.js         |    2 +-
 .../webnn/validation_tests/cast.https.any.js  |    2 +-
 .../webnn/validation_tests/clamp.https.any.js |   10 +-
 ...iews-sharing-same-arraybuffer.https.any.js |   10 +-
 .../validation_tests/concat.https.any.js      |   55 +-
 .../constant-changed-buffer.https.any.js      |   10 +-
 .../validation_tests/constant.https.any.js    |   54 +-
 .../validation_tests/conv2d.https.any.js      |  259 +-
 .../convTranspose2d.https.any.js              |  253 +-
 .../cumulativeSum.https.any.js                |   24 +-
 .../dequantizeLinear.https.any.js             |   79 +-
 .../destroyContext.https.any.js               |   18 +-
 .../destroyGraph.https.any.js                 |   18 +-
 .../elementwise-binary.https.any.js           |   46 +-
 .../webnn/validation_tests/elu.https.any.js   |   12 +-
 .../validation_tests/expand.https.any.js      |   34 +-
 .../validation_tests/gather.https.any.js      |   60 +-
 .../gatherElements.https.any.js               |   53 +-
 .../validation_tests/gatherND.https.any.js    |   76 +
 .../webnn/validation_tests/gemm.https.any.js  |   95 +-
 .../webnn/validation_tests/gru.https.any.js   |  190 +-
 .../validation_tests/gruCell.https.any.js     |  519 +-
 .../validation_tests/hardSigmoid.https.any.js |    7 +-
 .../webnn/validation_tests/input.https.any.js |   24 +-
 .../instanceNormalization.https.any.js        |   84 +-
 .../invalid-rank.https.any.js                 |    4 +-
 .../layerNormalization.https.any.js           |   98 +-
 .../validation_tests/leakyRelu.https.any.js   |    7 +-
 .../validation_tests/linear.https.any.js      |    7 +-
 .../webnn/validation_tests/lstm.https.any.js  |  181 +-
 .../validation_tests/lstmCell.https.any.js    |  425 +-
 .../validation_tests/matmul.https.any.js      |   66 +-
 .../webnn/validation_tests/pad.https.any.js   |   20 +-
 ...oling-and-reduction-keep-dims.https.any.js |   15 +-
 .../validation_tests/pooling.https.any.js     |  103 +-
 .../webnn/validation_tests/prelu.https.any.js |   48 +-
 .../quantizeLinear.https.any.js               |   79 +-
 .../validation_tests/reduction.https.any.js   |   20 +-
 .../validation_tests/resample2d.https.any.js  |   78 +-
 .../validation_tests/reshape.https.any.js     |   34 +-
 .../validation_tests/scatterND.https.any.js   |   63 +-
 .../webnn/validation_tests/slice.https.any.js |   24 +-
 .../validation_tests/softmax.https.any.js     |  111 +-
 .../webnn/validation_tests/split.https.any.js |   34 +-
 .../webnn/validation_tests/tile.https.any.js  |   22 +-
 .../validation_tests/transpose.https.any.js   |   22 +-
 .../validation_tests/triangular.https.any.js  |    4 +-
 .../webnn/validation_tests/where.https.any.js |   82 +-
 ...arameters-scaleResolutionDownTo.https.html |   24 +
 ...RTCPeerConnection-generateCertificate.html |   27 +
 .../transfer-datachannel-worker.js            |    0
 .../transfer-datachannel.html                 |    1 -
 591 files changed, 27135 insertions(+), 13215 deletions(-)
 rename tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/{cfrg_curves_bits.https.any.js.ini => cfrg_curves_bits_curve25519.https.any.js.ini} (54%)
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
 rename tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/{cfrg_curves_keys.https.any.js.ini => cfrg_curves_keys_curve25519.https.any.js.ini} (54%)
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-113.xht.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-box/parsing/height-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-box/parsing/max-height-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-box/parsing/max-width-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-box/parsing/width-valid.html.ini
 rename tests/wpt/meta-legacy-layout/css/css-cascade/{scope-shadow.tentative.html.ini => scope-shadow.html.ini} (92%)
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-flexbox/negative-overflow-003.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-computed.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-shorthand.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/block-size-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/inline-size-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-computed.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-computed.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-valid.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-masking/clip-path/clip-path-rect-004.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-composition.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-composition.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1b.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-021.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-022.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-023.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-trim-start-002.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-composition.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/dom/events/CustomEvent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/closed-listbox-rendering.tentative.html.ini (100%)
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/option-computed-style.tentative.html.ini (100%)
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-datalist-options-idl.tentative.html.ini (54%)
 rename tests/wpt/{meta/html/semantics/forms/the-select-element/stylable-select => meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select}/select-parsing.tentative.html.ini (76%)
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/selectedoptionelement-attr.tentative.html.ini (100%)
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/mimesniff/mime-types/charset-parameter.window.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/mimesniff/mime-types/parsing.any.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/mimesniff/sniffing/html.window.js.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
 rename tests/wpt/meta/WebCryptoAPI/derive_bits_keys/{cfrg_curves_bits.https.any.js.ini => cfrg_curves_bits_curve25519.https.any.js.ini} (54%)
 create mode 100644 tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
 rename tests/wpt/meta/WebCryptoAPI/derive_bits_keys/{cfrg_curves_keys.https.any.js.ini => cfrg_curves_keys_curve25519.https.any.js.ini} (54%)
 create mode 100644 tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
 delete mode 100644 tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
 delete mode 100644 tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
 create mode 100644 tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
 create mode 100644 tests/wpt/meta/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
 create mode 100644 tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
 create mode 100644 tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
 create mode 100644 tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
 rename tests/wpt/meta/css/css-cascade/{scope-shadow.tentative.html.ini => scope-shadow.html.ini} (92%)
 create mode 100644 tests/wpt/meta/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
 create mode 100644 tests/wpt/meta/css/css-flexbox/negative-overflow-003.html.ini
 delete mode 100644 tests/wpt/meta/css/css-overflow/incremental-scroll.html.ini
 create mode 100644 tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini
 create mode 100644 tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
 delete mode 100644 tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
 rename tests/wpt/meta/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/closed-listbox-rendering.tentative.html.ini (100%)
 rename tests/wpt/meta/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/option-computed-style.tentative.html.ini (100%)
 rename tests/wpt/meta/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-datalist-options-idl.tentative.html.ini (54%)
 rename tests/wpt/{meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select => meta/html/semantics/forms/the-select-element/customizable-select}/select-parsing.tentative.html.ini (76%)
 rename tests/wpt/meta/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/selectedoptionelement-attr.tentative.html.ini (100%)
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/webappapis/update-rendering/child-document-raf-order.html.ini
 delete mode 100644 tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini
 create mode 100644 tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js
 rename tests/wpt/tests/WebCryptoAPI/derive_bits_keys/{cfrg_curves_bits.https.any.js => cfrg_curves_bits_curve448.https.any.js} (75%)
 create mode 100644 tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js
 rename tests/wpt/tests/WebCryptoAPI/derive_bits_keys/{cfrg_curves_keys.https.any.js => cfrg_curves_keys_curve448.https.any.js} (89%)
 delete mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_fixtures.js
 create mode 100644 tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js
 rename tests/wpt/tests/WebCryptoAPI/sign_verify/{eddsa.https.any.js => eddsa_curve448.https.any.js} (88%)
 rename tests/wpt/tests/compute-pressure/{compute_pressure_basic.https.any.js => compute_pressure_basic.https.window.js} (55%)
 create mode 100644 tests/wpt/tests/compute-pressure/resources/common.js
 create mode 100644 tests/wpt/tests/compute-pressure/resources/worker-support.js
 create mode 100644 tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html
 create mode 100644 tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-cross-site-embed.html
 create mode 100644 tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-same-site-embed.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property-ref.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-ref.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse-ref.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html
 create mode 100644 tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html
 rename tests/wpt/tests/css/css-break/flexbox/{image-in-fragmented-flexbox-crash-001.html => image-in-fragmented-flexbox-001-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/flexbox/{image-in-fragmented-flexbox-crash-002.html => image-in-fragmented-flexbox-002-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/grid/{grid-item-placement-crash-multiple.html => grid-item-placement-multiple-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-fixedpos-in-inline-crash-000.html => nested-fixedpos-in-inline-000-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-fixedpos-in-inline-crash-001.html => nested-fixedpos-in-inline-001-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-fixedpos-in-inline-crash-002.html => nested-fixedpos-in-inline-002-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-001.html => nested-multicol-with-spanner-and-oof-001-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-002.html => nested-multicol-with-spanner-and-oof-002-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-003.html => nested-multicol-with-spanner-and-oof-003-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-004.html => nested-multicol-with-spanner-and-oof-004-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-005.html => nested-multicol-with-spanner-and-oof-005-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-006.html => nested-multicol-with-spanner-and-oof-006-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-007.html => nested-multicol-with-spanner-and-oof-007-crash.html} (100%)
 rename tests/wpt/tests/css/css-break/{nested-multicol-with-spanner-and-oof-crash-008.html => nested-multicol-with-spanner-and-oof-008-crash.html} (100%)
 rename tests/wpt/tests/css/css-cascade/{scope-shadow.tentative.html => scope-shadow.html} (96%)
 create mode 100644 tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-link-crash.html
 create mode 100644 tests/wpt/tests/css/css-color/relative-currentcolor-visited-getcomputedstyle.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-parsing.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-serialization.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/scroll-state-snapped-none.html
 create mode 100644 tests/wpt/tests/css/css-flexbox/negative-overflow-003.html
 rename tests/wpt/tests/css/css-masking/clip-path/animations/{clip-path-transition-crashtest.html => clip-path-transition-crash.html} (100%)
 create mode 100644 tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-004.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-001-crash.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-036-ref.html
 create mode 100644 tests/wpt/tests/css/css-shadow-parts/host-part-002.html
 create mode 100644 tests/wpt/tests/css/css-shadow-parts/multiple-scopes.html
 create mode 100644 tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-058.html
 create mode 100644 tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-021.html
 create mode 100644 tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-022.html
 create mode 100644 tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-023.html
 create mode 100644 tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-invalid.html
 create mode 100644 tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-valid.html
 create mode 100644 tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001-ref.html
 create mode 100644 tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/layered-capture/nested-opacity-ref.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/layered-capture/opacity-capture-observable-when-flat.tentative.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/nested-opacity-ref.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend-animated.tentative.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend.tentative.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/opacity-computed-style.tentative.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-done.tentative.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-skip.tentative.html
 create mode 100644 tests/wpt/tests/css/css-viewport/zoom/widget.html
 rename tests/wpt/tests/digital-credentials/{identity-create.tentative.https.html => create.tentative.https.html} (71%)
 rename tests/wpt/tests/digital-credentials/{identity-get.tentative.https.html => get.tentative.https.html} (75%)
 create mode 100644 tests/wpt/tests/digital-credentials/historical.any.js
 create mode 100644 tests/wpt/tests/fedcm/fedcm-abort-silent-mediation-not-permitted.https.html
 create mode 100644 tests/wpt/tests/html/canvas/color.window.js
 delete mode 100644 tests/wpt/tests/html/meta/resources/refresh.99.html
 delete mode 100644 tests/wpt/tests/html/meta/resources/refresh1dotdot5dot.html
 create mode 100644 tests/wpt/tests/html/meta/resources/refresh1dotdot9dot.html
 create mode 100644 tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-simple-crash.html
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/appearance-base-select-other-elements-ref.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/appearance-base-select-other-elements.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/closed-listbox-rendering-ref.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/closed-listbox-rendering.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/nested-options.tenative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/option-computed-style.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-accessibility-minimum-target-size.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-datalist-options-idl.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-disabled.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-fallback-datalist-animations.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-keyboard-behavior.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-mouse-behavior.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-option-hover-styles.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-parsing.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-size-multiple-new-content-ref.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/select-size-multiple-new-content.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/selectedoption.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/selectedoptionelement-attr.tentative.html (100%)
 rename tests/wpt/tests/html/semantics/forms/the-select-element/{stylable-select => customizable-select}/switch-picker-appearance.tentative.html (100%)
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-keyboard-hidden-option.tentative.html
 create mode 100644 tests/wpt/tests/interfaces/mediaqueries-5.idl
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/META.yml
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html.headers
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-get-cookie.sub.https.html
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-end.sub.https.html
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
 create mode 100644 tests/wpt/tests/nav-tracking-mitigations/stateful-client-bounce.sub.https.html
 create mode 100644 tests/wpt/tests/notifications/cross-origin-nested.tentative.https.sub.html
 create mode 100644 tests/wpt/tests/notifications/cross-origin-serviceworker.tentative.https.sub.html
 create mode 100644 tests/wpt/tests/notifications/resources/cross-origin-nested-child.sub.html
 create mode 100644 tests/wpt/tests/notifications/resources/cross-origin-nested-parent.sub.html
 create mode 100644 tests/wpt/tests/notifications/resources/cross-origin-serviceworker-iframe.sub.html
 create mode 100644 tests/wpt/tests/notifications/resources/permission-helper.js
 create mode 100644 tests/wpt/tests/notifications/resources/permission-sw.js
 create mode 100644 tests/wpt/tests/notifications/resources/permission-worker.js
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.close.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.localStorage-popin.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.permissions-popin.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.proxy-popin.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.recursive.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/partitioned-popins.wait.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/popinContextType.html.headers
 create mode 100644 tests/wpt/tests/partitioned-popins/resources/popinContextTypesSupported.html.headers
 create mode 100644 tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.html
 create mode 100644 tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.js
 create mode 100644 tests/wpt/tests/permissions-policy/resources/permissions-policy-hid.html
 create mode 100644 tests/wpt/tests/selection/Selection-direction-on-clicks.tentative.html
 rename tests/wpt/tests/{shadow-dom/selection-direction.tentative.html => selection/shadow-dom/tentative/Selection-direction.html} (100%)
 create mode 100644 tests/wpt/tests/shadow-dom/reference-target/tentative/dom-mutation.html
 create mode 100644 tests/wpt/tests/webauthn/getclientcapabilities.https.html
 create mode 100644 tests/wpt/tests/webcodecs/sfx.flac
 create mode 100644 tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html
 create mode 100644 tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute.https.sub.html
 create mode 100644 tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html
 create mode 100644 tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html.headers
 rename tests/wpt/tests/webhid/{idlharness.https.window.js => idlharness.https.any.js} (63%)
 create mode 100644 tests/wpt/tests/webhid/resources/hid-allowed-by-permissions-policy-worker.js
 create mode 100644 tests/wpt/tests/webhid/resources/hid-disabled-by-permissions-policy-worker.js
 create mode 100644 tests/wpt/tests/webnn/conformance_tests/gatherND.https.any.js
 create mode 100644 tests/wpt/tests/webnn/conformance_tests/scatterND.https.any.js
 create mode 100644 tests/wpt/tests/webnn/conformance_tests/subgraph.https.any.js
 create mode 100644 tests/wpt/tests/webnn/validation_tests/gatherND.https.any.js
 rename tests/wpt/tests/{webrtc-extensions => webrtc}/transfer-datachannel-worker.js (100%)
 rename tests/wpt/tests/{webrtc-extensions => webrtc}/transfer-datachannel.html (98%)

diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
similarity index 54%
rename from tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini
rename to tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
index 5e414c7aa15..b15e0c3c431 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
@@ -1,4 +1,4 @@
-[cfrg_curves_bits.https.any.html]
+[cfrg_curves_bits_curve25519.https.any.worker.html]
   [setup - define tests]
     expected: FAIL
 
@@ -20,23 +20,8 @@
   [X25519 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 key derivation checks for all-zero value result with a key of order 0]
-    expected: FAIL
 
-  [X448 key derivation checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
-
-
-[cfrg_curves_bits.https.any.worker.html]
+[cfrg_curves_bits_curve25519.https.any.html]
   [setup - define tests]
     expected: FAIL
 
@@ -57,18 +42,3 @@
 
   [X25519 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
new file mode 100644
index 00000000000..4d00d730a6a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
@@ -0,0 +1,38 @@
+[cfrg_curves_bits_curve448.https.any.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+
+[cfrg_curves_bits_curve448.https.any.worker.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
similarity index 54%
rename from tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini
rename to tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
index 68fe4aef6c2..3ceecca494b 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
@@ -1,13 +1,7 @@
-[cfrg_curves_keys.https.any.worker.html]
+[cfrg_curves_keys_curve25519.https.any.worker.html]
   [setup - define tests]
     expected: FAIL
 
-  [Key derivation using a X25519 generated keys.]
-    expected: FAIL
-
-  [Key derivation using a X448 generated keys.]
-    expected: FAIL
-
   [X25519 deriveBits checks for all-zero value result with a key of order 0]
     expected: FAIL
 
@@ -26,30 +20,12 @@
   [X25519 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 deriveBits checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
-
-
-[cfrg_curves_keys.https.any.html]
-  [setup - define tests]
-    expected: FAIL
-
   [Key derivation using a X25519 generated keys.]
     expected: FAIL
 
-  [Key derivation using a X448 generated keys.]
+
+[cfrg_curves_keys_curve25519.https.any.html]
+  [setup - define tests]
     expected: FAIL
 
   [X25519 deriveBits checks for all-zero value result with a key of order 0]
@@ -70,17 +46,5 @@
   [X25519 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 deriveBits checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+  [Key derivation using a X25519 generated keys.]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
new file mode 100644
index 00000000000..c3458b0df72
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
@@ -0,0 +1,44 @@
+[cfrg_curves_keys_curve448.https.any.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+  [Key derivation using a X448 generated keys.]
+    expected: FAIL
+
+
+[cfrg_curves_keys_curve448.https.any.worker.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+  [Key derivation using a X448 generated keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/getRandomValues.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/getRandomValues.any.js.ini
index a50fdb01eff..b3eccf4f594 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/getRandomValues.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/getRandomValues.any.js.ini
@@ -1,56 +1,8 @@
 [getRandomValues.any.worker.html]
-  [Integer array: BigInt64Array]
-    expected: FAIL
-
-  [Large length: BigInt64Array]
-    expected: FAIL
-
-  [Null arrays: BigInt64Array]
-    expected: FAIL
-
-  [Integer array: BigUint64Array]
-    expected: FAIL
-
-  [Large length: BigUint64Array]
-    expected: FAIL
-
-  [Null arrays: BigUint64Array]
-    expected: FAIL
-
   [Float16 arrays]
     expected: FAIL
 
-  [Subclass of BigInt64Array]
-    expected: FAIL
-
-  [Subclass of BigUint64Array]
-    expected: FAIL
-
 
 [getRandomValues.any.html]
-  [Integer array: BigInt64Array]
-    expected: FAIL
-
-  [Large length: BigInt64Array]
-    expected: FAIL
-
-  [Null arrays: BigInt64Array]
-    expected: FAIL
-
-  [Integer array: BigUint64Array]
-    expected: FAIL
-
-  [Large length: BigUint64Array]
-    expected: FAIL
-
-  [Null arrays: BigUint64Array]
-    expected: FAIL
-
   [Float16 arrays]
     expected: FAIL
-
-  [Subclass of BigInt64Array]
-    expected: FAIL
-
-  [Subclass of BigUint64Array]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
deleted file mode 100644
index 4c3061e29a5..00000000000
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
+++ /dev/null
@@ -1,698 +0,0 @@
-[okp_importKey.https.any.html]
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-
-[okp_importKey.https.any.worker.html]
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
new file mode 100644
index 00000000000..53ae48faf06
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
@@ -0,0 +1,188 @@
+[okp_importKey_Ed25519.https.any.worker.html]
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+
+[okp_importKey_Ed25519.https.any.html]
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
new file mode 100644
index 00000000000..a648a2c9e95
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
@@ -0,0 +1,188 @@
+[okp_importKey_Ed448.https.any.worker.html]
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+
+[okp_importKey_Ed448.https.any.html]
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
new file mode 100644
index 00000000000..6bf07f7980f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
@@ -0,0 +1,164 @@
+[okp_importKey_X25519.https.any.html]
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+
+[okp_importKey_X25519.https.any.worker.html]
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
new file mode 100644
index 00000000000..9120981ca5b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
@@ -0,0 +1,164 @@
+[okp_importKey_X448.https.any.worker.html]
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+
+[okp_importKey_X448.https.any.html]
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
deleted file mode 100644
index 1d48180b27e..00000000000
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
+++ /dev/null
@@ -1,242 +0,0 @@
-[eddsa.https.any.html]
-  [EdDSA Ed25519 verification]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed25519 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed25519 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed25519 round trip]
-    expected: FAIL
-
-  [EdDSA Ed25519 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed25519 keys.]
-    expected: FAIL
-
-  [EdDSA Ed448 verification]
-    expected: FAIL
-
-  [EdDSA Ed448 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed448 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed448 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed448 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed448 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed448 round trip]
-    expected: FAIL
-
-  [EdDSA Ed448 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed448 keys.]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 0]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 1]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 2]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 3]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 4]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 5]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 6]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 7]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 8]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 9]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 10]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 11]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 12]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 13]
-    expected: FAIL
-
-
-[eddsa.https.any.worker.html]
-  [EdDSA Ed25519 verification]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed25519 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed25519 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed25519 round trip]
-    expected: FAIL
-
-  [EdDSA Ed25519 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed25519 keys.]
-    expected: FAIL
-
-  [EdDSA Ed448 verification]
-    expected: FAIL
-
-  [EdDSA Ed448 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed448 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed448 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed448 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed448 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed448 round trip]
-    expected: FAIL
-
-  [EdDSA Ed448 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed448 keys.]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 0]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 1]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 2]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 3]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 4]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 5]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 6]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 7]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 8]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 9]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 10]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 11]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 12]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 13]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
new file mode 100644
index 00000000000..90b1c125ddc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
@@ -0,0 +1,80 @@
+[eddsa_curve25519.https.any.html]
+  [EdDSA Ed25519 verification]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed25519 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed25519 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed25519 round trip]
+    expected: FAIL
+
+  [EdDSA Ed25519 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed25519 keys.]
+    expected: FAIL
+
+
+[eddsa_curve25519.https.any.worker.html]
+  [EdDSA Ed25519 verification]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed25519 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed25519 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed25519 round trip]
+    expected: FAIL
+
+  [EdDSA Ed25519 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed25519 keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
new file mode 100644
index 00000000000..82b91e93175
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
@@ -0,0 +1,80 @@
+[eddsa_curve448.https.any.worker.html]
+  [EdDSA Ed448 verification]
+    expected: FAIL
+
+  [EdDSA Ed448 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed448 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed448 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed448 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed448 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed448 round trip]
+    expected: FAIL
+
+  [EdDSA Ed448 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed448 keys.]
+    expected: FAIL
+
+
+[eddsa_curve448.https.any.html]
+  [EdDSA Ed448 verification]
+    expected: FAIL
+
+  [EdDSA Ed448 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed448 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed448 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed448 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed448 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed448 round trip]
+    expected: FAIL
+
+  [EdDSA Ed448 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed448 keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
new file mode 100644
index 00000000000..0ce7184e0ff
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-cookies-a-b-a-embed.tentative.https.html]
+  [Same-site embed with a cross-site parent partitioned cookie access]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini b/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini
deleted file mode 100644
index 068736c5062..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[new-fc-beside-adjoining-float-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float.html.ini b/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float.html.ini
deleted file mode 100644
index 042b5c8181a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/floats/new-fc-beside-adjoining-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[new-fc-beside-adjoining-float.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-113.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-113.xht.ini
deleted file mode 100644
index b336778c090..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-113.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-113.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht.ini
deleted file mode 100644
index b2b41d98c21..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-min-height-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
new file mode 100644
index 00000000000..3821701e831
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-property.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
new file mode 100644
index 00000000000..f251fd61978
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-timing-function-reverse.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
new file mode 100644
index 00000000000..fa7deb78c2f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-timing-function.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-box/parsing/height-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-box/parsing/height-valid.html.ini
deleted file mode 100644
index 355e0a9ffee..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-box/parsing/height-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[height-valid.html]
-  [e.style['height'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['height'\] = "max-content" should set the property value]
-    expected: FAIL
-
-  [e.style['height'\] = "fit-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-height-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-height-valid.html.ini
deleted file mode 100644
index 8d004d653b8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-height-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[max-height-valid.html]
-  [e.style['max-height'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-height'\] = "max-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-height'\] = "fit-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-width-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-width-valid.html.ini
deleted file mode 100644
index 7e1e81ec5c1..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-box/parsing/max-width-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[max-width-valid.html]
-  [e.style['max-width'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-width'\] = "max-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-width'\] = "fit-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-box/parsing/width-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-box/parsing/width-valid.html.ini
deleted file mode 100644
index ec0a8326211..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-box/parsing/width-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[width-valid.html]
-  [e.style['width'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['width'\] = "max-content" should set the property value]
-    expected: FAIL
-
-  [e.style['width'\] = "fit-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.html.ini
similarity index 92%
rename from tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.html.ini
index bf47d2b4f77..45532a6b577 100644
--- a/tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-cascade/scope-shadow.html.ini
@@ -1,4 +1,4 @@
-[scope-shadow.tentative.html]
+[scope-shadow.html]
   [@scope can match :host]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
new file mode 100644
index 00000000000..ac5cb8ba7db
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
@@ -0,0 +1,3 @@
+[relative-currentcolor-visited-getcomputedstyle.html]
+  [Property background-color value 'rgb(from currentcolor r g b)' should not leak :visited for computed style]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
new file mode 100644
index 00000000000..72f4601118a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
@@ -0,0 +1,2 @@
+[at-container-overflowing-parsing.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
new file mode 100644
index 00000000000..18c1abafcc7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
@@ -0,0 +1,2 @@
+[at-container-overflowing-serialization.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
new file mode 100644
index 00000000000..e5d314021fb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
@@ -0,0 +1,2 @@
+[scroll-state-snapped-none.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/negative-overflow-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/negative-overflow-003.html.ini
new file mode 100644
index 00000000000..279e4cd62c3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-flexbox/negative-overflow-003.html.ini
@@ -0,0 +1,144 @@
+[negative-overflow-003.html]
+  [.container 1]
+    expected: FAIL
+
+  [.container 2]
+    expected: FAIL
+
+  [.container 3]
+    expected: FAIL
+
+  [.container 4]
+    expected: FAIL
+
+  [.container 5]
+    expected: FAIL
+
+  [.container 6]
+    expected: FAIL
+
+  [.container 7]
+    expected: FAIL
+
+  [.container 8]
+    expected: FAIL
+
+  [.container 9]
+    expected: FAIL
+
+  [.container 10]
+    expected: FAIL
+
+  [.container 11]
+    expected: FAIL
+
+  [.container 12]
+    expected: FAIL
+
+  [.container 13]
+    expected: FAIL
+
+  [.container 14]
+    expected: FAIL
+
+  [.container 15]
+    expected: FAIL
+
+  [.container 16]
+    expected: FAIL
+
+  [.container 17]
+    expected: FAIL
+
+  [.container 18]
+    expected: FAIL
+
+  [.container 19]
+    expected: FAIL
+
+  [.container 20]
+    expected: FAIL
+
+  [.container 21]
+    expected: FAIL
+
+  [.container 22]
+    expected: FAIL
+
+  [.container 23]
+    expected: FAIL
+
+  [.container 24]
+    expected: FAIL
+
+  [.container 25]
+    expected: FAIL
+
+  [.container 26]
+    expected: FAIL
+
+  [.container 27]
+    expected: FAIL
+
+  [.container 28]
+    expected: FAIL
+
+  [.container 29]
+    expected: FAIL
+
+  [.container 30]
+    expected: FAIL
+
+  [.container 31]
+    expected: FAIL
+
+  [.container 32]
+    expected: FAIL
+
+  [.container 33]
+    expected: FAIL
+
+  [.container 34]
+    expected: FAIL
+
+  [.container 35]
+    expected: FAIL
+
+  [.container 36]
+    expected: FAIL
+
+  [.container 37]
+    expected: FAIL
+
+  [.container 38]
+    expected: FAIL
+
+  [.container 39]
+    expected: FAIL
+
+  [.container 40]
+    expected: FAIL
+
+  [.container 41]
+    expected: FAIL
+
+  [.container 42]
+    expected: FAIL
+
+  [.container 43]
+    expected: FAIL
+
+  [.container 44]
+    expected: FAIL
+
+  [.container 45]
+    expected: FAIL
+
+  [.container 46]
+    expected: FAIL
+
+  [.container 47]
+    expected: FAIL
+
+  [.container 48]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-computed.html.ini
deleted file mode 100644
index 1fa3d086b3d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-computed.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[flex-basis-computed.html]
-  [Property flex-basis value 'fit-content']
-    expected: FAIL
-
-  [Property flex-basis value 'min-content']
-    expected: FAIL
-
-  [Property flex-basis value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-valid.html.ini
deleted file mode 100644
index 4d02731b951..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-basis-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[flex-basis-valid.html]
-  [e.style['flex-basis'\] = "fit-content" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-shorthand.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-shorthand.html.ini
deleted file mode 100644
index 52349e3b91d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-flexbox/parsing/flex-shorthand.html.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[flex-shorthand.html]
-  [e.style['flex'\] = "0 fit-content" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "0 fit-content" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "0 fit-content" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "0 fit-content" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "1 0 max-content" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "1 0 max-content" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "1 0 max-content" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "1 0 max-content" should not set unrelated longhands]
-    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 c3d30125e3b..3329f23836b 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
@@ -11,14 +11,11 @@
   [@font-face matching for quoted and unquoted ui-rounded]
     expected: FAIL
 
-  [@font-face matching for quoted and unquoted fangsong]
-    expected: FAIL
-
   [@font-face matching for quoted and unquoted ui-sans-serif]
     expected: FAIL
 
   [@font-face matching for quoted and unquoted ui-monospace]
     expected: FAIL
 
-  [@font-face matching for quoted and unquoted cursive]
+  [@font-face matching for quoted and unquoted serif]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/animation/object-position-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/animation/object-position-interpolation.html.ini
index bba280ebef4..ef7ef713ea0 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/animation/object-position-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/animation/object-position-interpolation.html.ini
@@ -1,67 +1,4 @@
 [object-position-interpolation.html]
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (-0.25) should be [62.5% 62.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (0.25) should be [37.5% 37.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (0.5) should be [25% 25%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (0.75) should be [12.5% 12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (1) should be [0% 0%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from neutral to [left top\] at (1.25) should be [-12.5% -12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (-0.25) should be [62.5% 62.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (0.25) should be [37.5% 37.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (0.5) should be [25% 25%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (0.75) should be [12.5% 12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (1) should be [0% 0%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from neutral to [left top\] at (1.25) should be [-12.5% -12.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (-0.25) should be [62.5% 62.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (0.25) should be [37.5% 37.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (0.5) should be [25% 25%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (0.75) should be [12.5% 12.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (1) should be [0% 0%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from neutral to [left top\] at (1.25) should be [-12.5% -12.5%\]]
-    expected: FAIL
-
   [Web Animations: property <object-position> from neutral to [left top\] at (-0.25) should be [62.5% 62.5%\]]
     expected: FAIL
 
@@ -83,69 +20,6 @@
   [Web Animations: property <object-position> from neutral to [left top\] at (1.25) should be [-12.5% -12.5%\]]
     expected: FAIL
 
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (-0.25) should be [50% 62.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (0.25) should be [50% 37.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (0.5) should be [50% 25%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (0.75) should be [50% 12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (1) should be [50% 0%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [center top\] at (1.25) should be [50% -12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (-0.25) should be [50% 62.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (0.25) should be [50% 37.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (0.5) should be [50% 25%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (0.75) should be [50% 12.5%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (1) should be [50% 0%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [center top\] at (1.25) should be [50% -12.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (-0.25) should be [50% 62.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (0.25) should be [50% 37.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (0.5) should be [50% 25%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (0.75) should be [50% 12.5%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (1) should be [50% 0%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [center top\] at (1.25) should be [50% -12.5%\]]
-    expected: FAIL
-
   [Web Animations: property <object-position> from [initial\] to [center top\] at (-0.25) should be [50% 62.5%\]]
     expected: FAIL
 
@@ -167,69 +41,6 @@
   [Web Animations: property <object-position> from [initial\] to [center top\] at (1.25) should be [50% -12.5%\]]
     expected: FAIL
 
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (-0.25) should be [62.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (0.25) should be [37.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (0.5) should be [25% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (0.75) should be [12.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (1) should be [0% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [initial\] to [left center\] at (1.25) should be [-12.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (-0.25) should be [62.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (0.25) should be [37.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (0.5) should be [25% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (0.75) should be [12.5% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (1) should be [0% 50%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [initial\] to [left center\] at (1.25) should be [-12.5% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (-0.25) should be [62.5% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (0) should be [50% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (0.25) should be [37.5% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (0.5) should be [25% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (0.75) should be [12.5% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (1) should be [0% 50%\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [initial\] to [left center\] at (1.25) should be [-12.5% 50%\]]
-    expected: FAIL
-
   [Web Animations: property <object-position> from [initial\] to [left center\] at (-0.25) should be [62.5% 50%\]]
     expected: FAIL
 
@@ -251,69 +62,6 @@
   [Web Animations: property <object-position> from [initial\] to [left center\] at (1.25) should be [-12.5% 50%\]]
     expected: FAIL
 
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (-0.25) should be [0px 0px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (0) should be [20px 20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (0.25) should be [40px 40px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (0.5) should be [60px 60px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (0.75) should be [80px 80px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (1) should be [100px 100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <object-position> from [20px 20px\] to [100px 100px\] at (1.25) should be [120px 120px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (-0.25) should be [0px 0px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (0) should be [20px 20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (0.25) should be [40px 40px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (0.5) should be [60px 60px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (0.75) should be [80px 80px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (1) should be [100px 100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <object-position> from [20px 20px\] to [100px 100px\] at (1.25) should be [120px 120px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (-0.25) should be [0px 0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (0) should be [20px 20px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (0.25) should be [40px 40px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (0.5) should be [60px 60px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (0.75) should be [80px 80px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (1) should be [100px 100px\]]
-    expected: FAIL
-
-  [CSS Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (1.25) should be [120px 120px\]]
-    expected: FAIL
-
   [Web Animations: property <object-position> from [20px 20px\] to [100px 100px\] at (-0.25) should be [0px 0px\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/inheritance.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/inheritance.html.ini
index 9f8bf376d9b..da6fcda9e06 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/inheritance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/inheritance.html.ini
@@ -1,16 +1,4 @@
 [inheritance.html]
-  [Property object-position has initial value 50% 50%]
-    expected: FAIL
-
-  [Property object-fit does not inherit]
-    expected: FAIL
-
-  [Property object-position does not inherit]
-    expected: FAIL
-
-  [Property object-fit has initial value fill]
-    expected: FAIL
-
   [Property image-orientation inherits]
     expected: FAIL
 
@@ -19,4 +7,3 @@
 
   [Property image-orientation has initial value from-image]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-computed.html.ini
index 7245a4bc778..e74d8c87478 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-computed.html.ini
@@ -17,21 +17,5 @@
   [Property object-fit value 'cover' computes to 'cover']
     expected: FAIL
 
-  [Property object-fit value 'fill']
-    expected: FAIL
-
   [Property object-fit value 'cover scale-down']
     expected: FAIL
-
-  [Property object-fit value 'contain']
-    expected: FAIL
-
-  [Property object-fit value 'cover']
-    expected: FAIL
-
-  [Property object-fit value 'scale-down']
-    expected: FAIL
-
-  [Property object-fit value 'none']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-valid.html.ini
index 3b6f81591a1..638e28931a9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-fit-valid.html.ini
@@ -1,28 +1,12 @@
 [object-fit-valid.html]
-  [e.style['object-fit'\] = "contain" should set the property value]
-    expected: FAIL
-
   [e.style['object-fit'\] = "contain scale-down" should set the property value]
     expected: FAIL
 
-  [e.style['object-fit'\] = "cover" should set the property value]
-    expected: FAIL
-
   [e.style['object-fit'\] = "cover scale-down" should set the property value]
     expected: FAIL
 
-  [e.style['object-fit'\] = "fill" should set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "scale-down" should set the property value]
-    expected: FAIL
-
   [e.style['object-fit'\] = "scale-down contain" should set the property value]
     expected: FAIL
 
   [e.style['object-fit'\] = "scale-down cover" should set the property value]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-computed.html.ini
index 245daffddff..84698b52852 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-computed.html.ini
@@ -46,52 +46,3 @@
 
   [Property object-position value 'right 20px bottom 10px' computes to 'calc(100% - 20px) calc(100% - 10px)']
     expected: FAIL
-
-  [Property object-position value '-20% -30px']
-    expected: FAIL
-
-  [Property object-position value 'right 40%']
-    expected: FAIL
-
-  [Property object-position value '30px center']
-    expected: FAIL
-
-  [Property object-position value 'center 50px']
-    expected: FAIL
-
-  [Property object-position value '40px top']
-    expected: FAIL
-
-  [Property object-position value 'right 30% top 60px']
-    expected: FAIL
-
-  [Property object-position value 'right 20px bottom 10px']
-    expected: FAIL
-
-  [Property object-position value 'left bottom']
-    expected: FAIL
-
-  [Property object-position value 'right 20% bottom 10%']
-    expected: FAIL
-
-  [Property object-position value '10% center']
-    expected: FAIL
-
-  [Property object-position value 'center']
-    expected: FAIL
-
-  [Property object-position value 'center bottom']
-    expected: FAIL
-
-  [Property object-position value 'center top']
-    expected: FAIL
-
-  [Property object-position value 'center center']
-    expected: FAIL
-
-  [Property object-position value 'left center']
-    expected: FAIL
-
-  [Property object-position value 'right bottom']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-valid.html.ini
index a8d5db2e430..ec1757f06ca 100644
--- a/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-images/parsing/object-position-valid.html.ini
@@ -1,58 +1,3 @@
 [object-position-valid.html]
-  [e.style['object-position'\] = "10%" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom 10% right 20%" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom right" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center left" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "left" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "top" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "top center" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "right 30% top 60px" should set the property value]
-    expected: FAIL
-
   [e.style['object-position'\] = "20% 30px" should set the property value]
     expected: FAIL
-
-  [e.style['object-position'\] = "30px center" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "40px top" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center 50px" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center bottom" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "left bottom" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "left center" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "right 40%" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center center" should set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "-20% -30px" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/block-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/block-size-valid.html.ini
deleted file mode 100644
index b3a281af8ec..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/block-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[block-size-valid.html]
-  [e.style['block-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['block-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/inline-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/inline-size-valid.html.ini
deleted file mode 100644
index b3e31a26127..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/inline-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[inline-size-valid.html]
-  [e.style['inline-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['inline-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-computed.html.ini
deleted file mode 100644
index 03e87d288b1..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-computed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[max-block-size-computed.html]
-  [Property max-block-size value 'min-content']
-    expected: FAIL
-
-  [Property max-block-size value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-valid.html.ini
deleted file mode 100644
index e24be8e2dd4..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-block-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[max-block-size-valid.html]
-  [e.style['max-block-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-block-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-computed.html.ini
deleted file mode 100644
index f2a47ef6a3d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-computed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[max-inline-size-computed.html]
-  [Property max-inline-size value 'min-content']
-    expected: FAIL
-
-  [Property max-inline-size value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-valid.html.ini
deleted file mode 100644
index cb6b6d05960..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/max-inline-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[max-inline-size-valid.html]
-  [e.style['max-inline-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-inline-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-computed.html.ini
index bc7cb9f4145..74cc74f72ea 100644
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-computed.html.ini
@@ -1,9 +1,3 @@
 [min-block-size-computed.html]
   [Property min-block-size value 'auto']
     expected: FAIL
-
-  [Property min-block-size value 'min-content']
-    expected: FAIL
-
-  [Property min-block-size value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-valid.html.ini
deleted file mode 100644
index 62679dd2108..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-block-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[min-block-size-valid.html]
-  [e.style['min-block-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['min-block-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-computed.html.ini
index cbd4c7d9551..50598a7cf1d 100644
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-computed.html.ini
@@ -1,9 +1,3 @@
 [min-inline-size-computed.html]
   [Property min-inline-size value 'auto']
     expected: FAIL
-
-  [Property min-inline-size value 'min-content']
-    expected: FAIL
-
-  [Property min-inline-size value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-valid.html.ini
deleted file mode 100644
index d8cb2c1bc9e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-logical/parsing/min-inline-size-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[min-inline-size-valid.html]
-  [e.style['min-inline-size'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['min-inline-size'\] = "max-content" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-masking/clip-path/clip-path-rect-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-masking/clip-path/clip-path-rect-004.html.ini
new file mode 100644
index 00000000000..e0cf0739cc4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-masking/clip-path/clip-path-rect-004.html.ini
@@ -0,0 +1,2 @@
+[clip-path-rect-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
new file mode 100644
index 00000000000..17ee387fe0b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-035.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
new file mode 100644
index 00000000000..d1cf1a87612
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-036.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
new file mode 100644
index 00000000000..eb0cd26bcdc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-037.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-composition.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-composition.html.ini
deleted file mode 100644
index 643dbbe0ca0..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-composition.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[height-composition.html]
-  [Compositing: property <height> underlying [min-content\] from add [100px\] to add [200px\] at (-0.3) should be [70px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [min-content\] from add [100px\] to add [200px\] at (0) should be [100px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [min-content\] from add [100px\] to add [200px\] at (0.5) should be [150px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [min-content\] from add [100px\] to add [200px\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [min-content\] from add [100px\] to add [200px\] at (1.5) should be [250px\]]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-interpolation.html.ini
index dc50dbd49b6..91770eebef3 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/height-interpolation.html.ini
@@ -233,90 +233,6 @@
   [Web Animations: property <height> from [auto\] to [20px\] at (1.5) should be [20px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -368,18 +284,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -389,60 +293,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (0) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (0) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
   [CSS Animations: property <height> from [fit-content\] to [20px\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -485,90 +335,6 @@
   [Web Animations: property <height> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -773,72 +539,6 @@
   [Web Animations: property <height> from [max-content\] to neutral at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <height> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-height-interpolation.html.ini
index 4c36ab329cb..8eaf2327da4 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-height-interpolation.html.ini
@@ -242,18 +242,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.3) should be [none\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (-0.3) should be [none\]]
     expected: FAIL
 
@@ -263,60 +251,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.3) should be [none\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-height> from [none\] to [max-content\] at (-0.3) should be [none\]]
     expected: FAIL
 
@@ -494,18 +428,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.3) should be [20px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [20px\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [20px\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (-0.3) should be [20px\]]
     expected: FAIL
 
@@ -515,60 +437,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.3) should be [20px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [20px\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [20px\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [20px\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-height> from [20px\] to [min-content\] at (-0.3) should be [20px\]]
     expected: FAIL
 
@@ -647,72 +515,6 @@
   [Web Animations: property <max-height> from [min-content\] to neutral at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-height> from neutral to [max-content\] at (0.5) should be [max-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-width-interpolation.html.ini
index 25802ec7449..c958add5ba3 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/max-width-interpolation.html.ini
@@ -368,18 +368,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -389,60 +377,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (0) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (0) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (0.5) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (0.6) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (1) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [20px\] at (1.5) should be [20px\]]
-    expected: FAIL
-
   [CSS Animations: property <max-width> from [fit-content\] to [20px\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -494,18 +428,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -515,60 +437,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -647,72 +515,6 @@
   [Web Animations: property <max-width> from [min-content\] to neutral at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-width> from neutral to [fit-content\] at (0.5) should be [fit-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-height-interpolation.html.ini
index 37508f1bf02..c30064e42fd 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-height-interpolation.html.ini
@@ -302,18 +302,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -323,60 +311,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -581,72 +515,6 @@
   [Web Animations: property <min-height> from [fit-content\] to neutral at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-height> from neutral to [min-content\] at (0.5) should be [min-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-width-interpolation.html.ini
index 96580874284..435b28a7aec 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/min-width-interpolation.html.ini
@@ -368,18 +368,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [min-content\]]
     expected: FAIL
 
@@ -389,60 +377,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [min-content\]]
     expected: FAIL
 
@@ -494,18 +428,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.3) should be [auto\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -515,60 +437,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.3) should be [auto\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -647,72 +515,6 @@
   [Web Animations: property <min-width> from [fit-content\] to neutral at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-width> from neutral to [max-content\] at (0.5) should be [max-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-composition.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-composition.html.ini
deleted file mode 100644
index 161ad92d8df..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-composition.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[width-composition.html]
-  [Compositing: property <width> underlying [100px\] from add [100px\] to add [min-content\] at (-0.3) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [100px\] to add [min-content\] at (0) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [100px\] to add [min-content\] at (0.5) should be [75px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [100px\] to add [min-content\] at (1) should be [75px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [100px\] to add [min-content\] at (1.5) should be [75px\]]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-interpolation.html.ini
index 66012d15c2d..da3bd55134b 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/animation/width-interpolation.html.ini
@@ -269,90 +269,6 @@
   [Web Animations: property <width> from [auto\] to [40px\] at (1.5) should be [40px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -530,18 +446,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.3) should be [30px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [30px\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [30px\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (-0.3) should be [30px\]]
     expected: FAIL
 
@@ -551,60 +455,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.3) should be [30px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [30px\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [30px\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [30px\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <width> from [30px\] to [fit-content\] at (-0.3) should be [30px\]]
     expected: FAIL
 
@@ -647,90 +497,6 @@
   [Web Animations: property <width> from [30px\] to [fit-content\] at (1.5) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -809,72 +575,6 @@
   [Web Animations: property <width> from [max-content\] to neutral at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <width> from neutral to [min-content\] at (0.5) should be [min-content\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini
deleted file mode 100644
index be541dcf01f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-size-with-min-or-max-content-1a.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1b.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1b.html.ini
deleted file mode 100644
index c8a03d02ad7..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/block-size-with-min-or-max-content-1b.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-size-with-min-or-max-content-1b.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
new file mode 100644
index 00000000000..35256741d38
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
@@ -0,0 +1,2 @@
+[dynamic-available-size-iframe.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
deleted file mode 100644
index 2aa2bd6c2cd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html.ini
deleted file mode 100644
index 26711bf3ace..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-021.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-021.html.ini
new file mode 100644
index 00000000000..8ddb1d69a18
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-021.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-021.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-022.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-022.html.ini
new file mode 100644
index 00000000000..7b6ee53191e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-022.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-023.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-023.html.ini
new file mode 100644
index 00000000000..873156dc23c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/intrinsic-percent-replaced-023.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-023.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/height-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/height-valid.html.ini
index 70d87ba7d21..6d7711beb8c 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/height-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/height-valid.html.ini
@@ -1,10 +1,4 @@
 [height-valid.html]
-  [e.style['height'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['height'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['height'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-computed.html.ini
index 749300a51c9..1ce030b6ca3 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-computed.html.ini
@@ -1,10 +1,4 @@
 [max-height-computed.html]
-  [Property max-height value 'min-content']
-    expected: FAIL
-
-  [Property max-height value 'max-content']
-    expected: FAIL
-
   [Property max-height value 'fit-content(10px)']
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-valid.html.ini
index aa2ca4c98c9..e6d91c7ad3c 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-height-valid.html.ini
@@ -1,10 +1,4 @@
 [max-height-valid.html]
-  [e.style['max-height'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-height'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['max-height'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-computed.html.ini
index cfc40fa6e85..a3433878bcc 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-computed.html.ini
@@ -1,10 +1,4 @@
 [max-width-computed.html]
-  [Property max-width value 'min-content']
-    expected: FAIL
-
-  [Property max-width value 'max-content']
-    expected: FAIL
-
   [Property max-width value 'fit-content(10px)']
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-valid.html.ini
index 5c57b8b2324..827822e9396 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/max-width-valid.html.ini
@@ -1,10 +1,4 @@
 [max-width-valid.html]
-  [e.style['max-width'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['max-width'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['max-width'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-computed.html.ini
index 7227f1aa7d9..38fde2d8e70 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-computed.html.ini
@@ -1,10 +1,4 @@
 [min-height-computed.html]
-  [Property min-height value 'min-content']
-    expected: FAIL
-
-  [Property min-height value 'max-content']
-    expected: FAIL
-
   [Property min-height value 'fit-content(10px)']
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-valid.html.ini
index 07aa7e9cb8b..4a673ae2cf1 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-height-valid.html.ini
@@ -1,10 +1,4 @@
 [min-height-valid.html]
-  [e.style['min-height'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['min-height'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['min-height'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-computed.html.ini
index 96c298af5d2..5e87562d965 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-computed.html.ini
@@ -1,10 +1,4 @@
 [min-width-computed.html]
-  [Property min-width value 'min-content']
-    expected: FAIL
-
-  [Property min-width value 'max-content']
-    expected: FAIL
-
   [Property min-width value 'fit-content(10px)']
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-valid.html.ini
index 65faa47d659..bfb9555dadc 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/min-width-valid.html.ini
@@ -1,10 +1,4 @@
 [min-width-valid.html]
-  [e.style['min-width'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['min-width'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['min-width'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/width-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/width-valid.html.ini
index ef7289bf26c..4538a8f7fce 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/width-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/parsing/width-valid.html.ini
@@ -1,10 +1,4 @@
 [width-valid.html]
-  [e.style['width'\] = "min-content" should set the property value]
-    expected: FAIL
-
-  [e.style['width'\] = "max-content" should set the property value]
-    expected: FAIL
-
   [e.style['width'\] = "fit-content(10%)" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
deleted file mode 100644
index 0958045ea3e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
index 58566e30618..d960be1f4df 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
@@ -31,3 +31,6 @@
 
   [Property text-emphasis-position has initial value over]
     expected: FAIL
+
+  [Property text-emphasis-position has initial value auto]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
index ed48097c3d9..84fa28b920b 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
@@ -16,3 +16,6 @@
 
   [Property text-emphasis-position value 'under left']
     expected: FAIL
+
+  [Property text-emphasis-position value 'auto']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
new file mode 100644
index 00000000000..6816048b7a8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
@@ -0,0 +1,15 @@
+[text-emphasis-position-valid.html]
+  [e.style['text-emphasis-position'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "over left" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "right under" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "over" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "under" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-trim-start-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-trim-start-002.html.ini
deleted file mode 100644
index eb2eae5396b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-trim-start-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[letter-spacing-trim-start-002.html]
-  [assert_equals(t.offsetWidth, refWidth, "widths should now match")]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-intrinsic-size-021.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-intrinsic-size-021.html.ini
index 0cd8fc91e6d..a1b8879de43 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-intrinsic-size-021.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-intrinsic-size-021.html.ini
@@ -65,24 +65,12 @@
   [.container > div 77]
     expected: FAIL
 
-  [.container > div 95]
-    expected: FAIL
-
-  [.container > div 96]
-    expected: FAIL
-
   [.container > div 103]
     expected: FAIL
 
   [.container > div 104]
     expected: FAIL
 
-  [.container > div 119]
-    expected: FAIL
-
-  [.container > div 120]
-    expected: FAIL
-
   [.container > div 127]
     expected: FAIL
 
@@ -100,3 +88,36 @@
 
   [.container > div 144]
     expected: FAIL
+
+  [.container > div 82]
+    expected: FAIL
+
+  [.container > div 86]
+    expected: FAIL
+
+  [.container > div 87]
+    expected: FAIL
+
+  [.container > div 111]
+    expected: FAIL
+
+  [.container > div 112]
+    expected: FAIL
+
+  [.container > div 151]
+    expected: FAIL
+
+  [.container > div 152]
+    expected: FAIL
+
+  [.container > div 169]
+    expected: FAIL
+
+  [.container > div 170]
+    expected: FAIL
+
+  [.container > div 173]
+    expected: FAIL
+
+  [.container > div 174]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-composition.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-composition.html.ini
deleted file mode 100644
index b649855796c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-composition.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[interpolate-size-height-composition.html]
-  [Compositing: property <height> underlying [fit-content\] from add [100px\] to add [200px\] at (-0.3) should be [120px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [100px\] to add [200px\] at (0) should be [150px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [100px\] to add [200px\] at (0.5) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [100px\] to add [200px\] at (1) should be [250px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [100px\] to add [200px\] at (1.5) should be [300px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [min-content\] to add [200px\] at (-0.3) should be [5px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [min-content\] to add [200px\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [min-content\] to add [200px\] at (0.5) should be [125px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [min-content\] to add [200px\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <height> underlying [fit-content\] from add [min-content\] to add [200px\] at (1.5) should be [275px\]]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
index 2cea53c78fe..f11bb6ed9b0 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
@@ -71,60 +71,6 @@
   [Web Animations: property <height> from [auto\] to [10px\] at (1.5) should be [0px\]]
     expected: FAIL
 
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (-0.3) should be [5px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (0.3) should be [95px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [min-content\] to [inherit\] at (1.5) should be [275px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (-0.3) should be [5px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (0.3) should be [95px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [min-content\] to [inherit\] at (1.5) should be [275px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (-0.3) should be [5px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (0.3) should be [95px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [min-content\] to [inherit\] at (1.5) should be [275px\]]
-    expected: FAIL
-
   [Web Animations: property <height> from [min-content\] to [inherit\] at (-0.3) should be [5px\]]
     expected: FAIL
 
@@ -143,111 +89,6 @@
   [Web Animations: property <height> from [min-content\] to [inherit\] at (1.5) should be [275px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [Web Animations: property <height> from [auto\] to [min-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -269,60 +110,6 @@
   [Web Animations: property <height> from [auto\] to [min-content\] at (1.5) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (-0.3) should be [62px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (0.3) should be [38px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (0.6) should be [26px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (1) should be [10px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [fit-content\] to [10px\] at (1.5) should be [0px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (-0.3) should be [62px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (0.3) should be [38px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (0.6) should be [26px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (1) should be [10px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [fit-content\] to [10px\] at (1.5) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (-0.3) should be [62px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (0.3) should be [38px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (0.6) should be [26px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (1) should be [10px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [fit-content\] to [10px\] at (1.5) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <height> from [fit-content\] to [10px\] at (-0.3) should be [62px\]]
     expected: FAIL
 
@@ -341,111 +128,6 @@
   [Web Animations: property <height> from [fit-content\] to [10px\] at (1.5) should be [0px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [Web Animations: property <height> from [max-content\] to [fit-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -593,60 +275,6 @@
   [Web Animations: property <height> from [max-content\] to [stretch\] at (1.5) should be [stretch\]]
     expected: FAIL
 
-  [CSS Transitions: property <height> from [max-content\] to neutral at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to neutral at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to neutral at (0.3) should be [80px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to neutral at (0.6) should be [110px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to neutral at (1) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from [max-content\] to neutral at (1.5) should be [200px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (0.3) should be [80px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (0.6) should be [110px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (1) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from [max-content\] to neutral at (1.5) should be [200px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (-0.3) should be [20px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (0.3) should be [80px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (0.6) should be [110px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (1) should be [150px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from [max-content\] to neutral at (1.5) should be [200px\]]
-    expected: FAIL
-
   [Web Animations: property <height> from [max-content\] to neutral at (-0.3) should be [20px\]]
     expected: FAIL
 
@@ -665,60 +293,6 @@
   [Web Animations: property <height> from [max-content\] to neutral at (1.5) should be [200px\]]
     expected: FAIL
 
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (-0.3) should be [180px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0.3) should be [120px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (0.6) should be [90px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <height> from neutral to [fit-content\] at (1.5) should be [0px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (-0.3) should be [180px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0.3) should be [120px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (0.6) should be [90px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <height> from neutral to [fit-content\] at (1.5) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (-0.3) should be [180px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (0) should be [150px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (0.3) should be [120px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (0.6) should be [90px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <height> from neutral to [fit-content\] at (1.5) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <height> from neutral to [fit-content\] at (-0.3) should be [180px\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-logical-properties-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-logical-properties-interpolation.html.ini
index 76110844385..379c8195291 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-logical-properties-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-logical-properties-interpolation.html.ini
@@ -11,9 +11,6 @@
   [CSS Transitions: property <block-size> from [max-content\] to [25px\] at (0.6) should be [45px\]]
     expected: FAIL
 
-  [CSS Transitions: property <block-size> from [max-content\] to [25px\] at (1) should be [25px\]]
-    expected: FAIL
-
   [CSS Transitions: property <block-size> from [max-content\] to [25px\] at (1.5) should be [0px\]]
     expected: FAIL
 
@@ -29,9 +26,6 @@
   [CSS Transitions with transition: all: property <block-size> from [max-content\] to [25px\] at (0.6) should be [45px\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <block-size> from [max-content\] to [25px\] at (1) should be [25px\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <block-size> from [max-content\] to [25px\] at (1.5) should be [0px\]]
     expected: FAIL
 
@@ -83,9 +77,6 @@
   [CSS Transitions: property <inline-size> from [max-content\] to neutral at (0.6) should be [110px\]]
     expected: FAIL
 
-  [CSS Transitions: property <inline-size> from [max-content\] to neutral at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions: property <inline-size> from [max-content\] to neutral at (1.5) should be [87.5px\]]
     expected: FAIL
 
@@ -101,9 +92,6 @@
   [CSS Transitions with transition: all: property <inline-size> from [max-content\] to neutral at (0.6) should be [110px\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <inline-size> from [max-content\] to neutral at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <inline-size> from [max-content\] to neutral at (1.5) should be [87.5px\]]
     expected: FAIL
 
@@ -119,9 +107,6 @@
   [CSS Animations: property <inline-size> from [max-content\] to neutral at (0.6) should be [110px\]]
     expected: FAIL
 
-  [CSS Animations: property <inline-size> from [max-content\] to neutral at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Animations: property <inline-size> from [max-content\] to neutral at (1.5) should be [87.5px\]]
     expected: FAIL
 
@@ -179,24 +164,6 @@
   [CSS Transitions with transition: all: property <max-block-size> from neutral to [fit-content\] at (1.5) should be [calc-size(fit-content, -50px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (-0.3) should be [calc-size(fit-content, 130px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (0) should be [calc-size(fit-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (0.3) should be [calc-size(fit-content, 70px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (0.6) should be [calc-size(fit-content, 40px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (1) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-block-size> from neutral to [fit-content\] at (1.5) should be [calc-size(fit-content, -50px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-block-size> from neutral to [fit-content\] at (-0.3) should be [calc-size(fit-content, 130px + size * -0.3)\]]
     expected: FAIL
 
@@ -251,24 +218,6 @@
   [CSS Transitions with transition: all: property <max-inline-size> from [max-content\] to [100px\] at (1.5) should be [calc-size(max-content, 150px + size * -0.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (-0.3) should be [calc-size(max-content, -30px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (0) should be [calc-size(max-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (0.3) should be [calc-size(max-content, 30px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (0.6) should be [calc-size(max-content, 60px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (1) should be [calc-size(max-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-inline-size> from [max-content\] to [100px\] at (1.5) should be [calc-size(max-content, 150px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-inline-size> from [max-content\] to [100px\] at (-0.3) should be [calc-size(max-content, -30px + size * 1.3)\]]
     expected: FAIL
 
@@ -323,24 +272,6 @@
   [CSS Transitions with transition: all: property <min-block-size> from [200px\] to [min-content\] at (1.5) should be [calc-size(min-content, -100px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (-0.3) should be [calc-size(min-content, 260px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (0) should be [calc-size(min-content, 200px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (0.3) should be [calc-size(min-content, 140px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (0.6) should be [calc-size(min-content, 80px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (1) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-block-size> from [200px\] to [min-content\] at (1.5) should be [calc-size(min-content, -100px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <min-block-size> from [200px\] to [min-content\] at (-0.3) should be [calc-size(min-content, 260px + size * -0.3)\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-height-interpolation.html.ini
index d963c09739b..ade8b9fa430 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-height-interpolation.html.ini
@@ -188,18 +188,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.3) should be [none\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (-0.3) should be [none\]]
     expected: FAIL
 
@@ -209,60 +197,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.3) should be [none\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [none\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-height> from [none\] to [max-content\] at (-0.3) should be [none\]]
     expected: FAIL
 
@@ -467,24 +401,6 @@
   [CSS Transitions with transition: all: property <max-height> from [150px\] to [min-content\] at (1.5) should be [calc-size(min-content, -75px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (-0.3) should be [calc-size(min-content, 195px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (0) should be [calc-size(min-content, 150px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (0.3) should be [calc-size(min-content, 105px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (0.6) should be [calc-size(min-content, 60px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (1) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [150px\] to [min-content\] at (1.5) should be [calc-size(min-content, -75px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-height> from [150px\] to [min-content\] at (-0.3) should be [calc-size(min-content, 195px + size * -0.3)\]]
     expected: FAIL
 
@@ -503,60 +419,6 @@
   [Web Animations: property <max-height> from [150px\] to [min-content\] at (1.5) should be [calc-size(min-content, -75px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -30px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 30px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 60px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (1) should be [calc-size(min-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-height> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 150px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -30px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 30px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 60px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (1) should be [calc-size(min-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-height> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 150px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -30px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 30px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 60px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (1) should be [calc-size(min-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 150px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-height> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -30px + size * 1.3)\]]
     expected: FAIL
 
@@ -611,24 +473,6 @@
   [CSS Transitions with transition: all: property <max-height> from neutral to [max-content\] at (1.5) should be [calc-size(max-content, -50px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (-0.3) should be [calc-size(max-content, 130px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (0) should be [calc-size(max-content, 100px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (0.3) should be [calc-size(max-content, 70px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (0.6) should be [calc-size(max-content, 40px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (1) should be [calc-size(max-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-height> from neutral to [max-content\] at (1.5) should be [calc-size(max-content, -50px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-height> from neutral to [max-content\] at (-0.3) should be [calc-size(max-content, 130px + size * -0.3)\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-width-interpolation.html.ini
index f005b4f4766..5fe600a79ac 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-max-width-interpolation.html.ini
@@ -341,24 +341,6 @@
   [CSS Transitions with transition: all: property <max-width> from [fit-content\] to [50px\] at (1.5) should be [calc-size(fit-content, 75px + size * -0.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (-0.3) should be [calc-size(fit-content, -15px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (0.3) should be [calc-size(fit-content, 15px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (0.6) should be [calc-size(fit-content, 30px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (1) should be [calc-size(fit-content, 50px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [fit-content\] to [50px\] at (1.5) should be [calc-size(fit-content, 75px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-width> from [fit-content\] to [50px\] at (-0.3) should be [calc-size(fit-content, -15px + size * 1.3)\]]
     expected: FAIL
 
@@ -386,18 +368,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -407,60 +377,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <max-width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -503,60 +419,6 @@
   [Web Animations: property <max-width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -45px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 45px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 90px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (1) should be [calc-size(min-content, 150px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <max-width> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 225px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -45px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 45px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 90px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (1) should be [calc-size(min-content, 150px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <max-width> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 225px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -45px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (0) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (0.3) should be [calc-size(min-content, 45px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (0.6) should be [calc-size(min-content, 90px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (1) should be [calc-size(min-content, 150px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from [min-content\] to neutral at (1.5) should be [calc-size(min-content, 225px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-width> from [min-content\] to neutral at (-0.3) should be [calc-size(min-content, -45px + size * 1.3)\]]
     expected: FAIL
 
@@ -611,24 +473,6 @@
   [CSS Transitions with transition: all: property <max-width> from neutral to [fit-content\] at (1.5) should be [calc-size(fit-content, -75px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (-0.3) should be [calc-size(fit-content, 195px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (0) should be [calc-size(fit-content, 150px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (0.3) should be [calc-size(fit-content, 105px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (0.6) should be [calc-size(fit-content, 60px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (1) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <max-width> from neutral to [fit-content\] at (1.5) should be [calc-size(fit-content, -75px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <max-width> from neutral to [fit-content\] at (-0.3) should be [calc-size(fit-content, 195px + size * -0.3)\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-height-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-height-interpolation.html.ini
index cdb6f02c96c..4b06d92eaf6 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-height-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-height-interpolation.html.ini
@@ -224,18 +224,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -245,60 +233,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [fit-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-height> from [fit-content\] to [min-content\] at (-0.3) should be [fit-content\]]
     expected: FAIL
 
@@ -467,60 +401,6 @@
   [Web Animations: property <min-height> from [max-content\] to [stretch\] at (1.5) should be [stretch\]]
     expected: FAIL
 
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-height> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-height> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <min-height> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
     expected: FAIL
 
@@ -575,24 +455,6 @@
   [CSS Transitions with transition: all: property <min-height> from neutral to [min-content\] at (1.5) should be [calc-size(min-content, -5px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (-0.3) should be [calc-size(min-content, 13px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (0) should be [calc-size(min-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (0.3) should be [calc-size(min-content, 7px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (0.6) should be [calc-size(min-content, 4px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (1) should be [calc-size(min-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-height> from neutral to [min-content\] at (1.5) should be [calc-size(min-content, -5px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <min-height> from neutral to [min-content\] at (-0.3) should be [calc-size(min-content, 13px + size * -0.3)\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-width-interpolation.html.ini
index 60e5c1a02c4..1e50c658869 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-min-width-interpolation.html.ini
@@ -242,18 +242,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [min-content\]]
     expected: FAIL
 
@@ -263,60 +251,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [min-content\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-width> from [min-content\] to [fit-content\] at (-0.3) should be [min-content\]]
     expected: FAIL
 
@@ -368,18 +302,6 @@
   [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.3) should be [auto\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -389,60 +311,6 @@
   [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.3) should be [auto\]]
     expected: FAIL
 
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.5) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (0.6) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (1) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
-    expected: FAIL
-
   [CSS Animations: property <min-width> from [auto\] to [max-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -485,60 +353,6 @@
   [Web Animations: property <min-width> from [auto\] to [max-content\] at (1.5) should be [max-content\]]
     expected: FAIL
 
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions: property <min-width> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <min-width> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (0) should be [calc-size(fit-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (0.3) should be [calc-size(fit-content, 3px + size * 0.7)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (0.6) should be [calc-size(fit-content, 6px + size * 0.4)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (1) should be [calc-size(fit-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from [fit-content\] to neutral at (1.5) should be [calc-size(fit-content, 15px + size * -0.5)\]]
-    expected: FAIL
-
   [Web Animations: property <min-width> from [fit-content\] to neutral at (-0.3) should be [calc-size(fit-content, -3px + size * 1.3)\]]
     expected: FAIL
 
@@ -593,24 +407,6 @@
   [CSS Transitions with transition: all: property <min-width> from neutral to [max-content\] at (1.5) should be [calc-size(max-content, -5px + size * 1.5)\]]
     expected: FAIL
 
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (-0.3) should be [calc-size(max-content, 13px + size * -0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (0) should be [calc-size(max-content, 10px + size * 0)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (0.3) should be [calc-size(max-content, 7px + size * 0.3)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (0.6) should be [calc-size(max-content, 4px + size * 0.6)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (1) should be [calc-size(max-content, 0px + size * 1)\]]
-    expected: FAIL
-
-  [CSS Animations: property <min-width> from neutral to [max-content\] at (1.5) should be [calc-size(max-content, -5px + size * 1.5)\]]
-    expected: FAIL
-
   [Web Animations: property <min-width> from neutral to [max-content\] at (-0.3) should be [calc-size(max-content, 13px + size * -0.3)\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
index 5160938c50b..a2e6b16879a 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
@@ -19,3 +19,6 @@
 
   [Use the non-animation value of interpolate-size: allow-keywords when starting CSS animation from min-content to 100px]
     expected: FAIL
+
+  [Use the after-change value of interpolate-size: allow-keywords when starting CSS transition from 100px to min-content]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
deleted file mode 100644
index 3349052a7b2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[interpolate-size-width-composition.html]
-  [Compositing: property <width> underlying [100px\] from add [fit-content\] to add [auto\] at (-0.3) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [fit-content\] to add [auto\] at (0) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [fit-content\] to add [auto\] at (0.5) should be [300px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [fit-content\] to add [auto\] at (1) should be [300px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [100px\] from add [fit-content\] to add [auto\] at (1.5) should be [300px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [max-content\] from add [100px\] to add [auto\] at (-0.3) should be [70px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [max-content\] from add [100px\] to add [auto\] at (0) should be [100px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [max-content\] from add [100px\] to add [auto\] at (0.5) should be [150px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [max-content\] from add [100px\] to add [auto\] at (1) should be [200px\]]
-    expected: FAIL
-
-  [Compositing: property <width> underlying [max-content\] from add [100px\] to add [auto\] at (1.5) should be [250px\]]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
index b565f16cd14..a9f4baabd9e 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
@@ -53,111 +53,6 @@
   [Web Animations: property <width> from [auto\] to [50px\] at (1.5) should be [0px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (-0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.3) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (0.5) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (0.6) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (1) should be [fit-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [auto\] to [fit-content\] at (1.5) should be [fit-content\]]
-    expected: FAIL
-
   [Web Animations: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
     expected: FAIL
 
@@ -305,60 +200,6 @@
   [Web Animations: property <width> from [stretch\] to [auto\] at (1.5) should be [auto\]]
     expected: FAIL
 
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (-0.3) should be [230px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (0) should be [200px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (0.3) should be [170px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (-0.3) should be [230px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (0) should be [200px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (0.3) should be [170px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (-0.3) should be [230px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (0) should be [200px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (0.3) should be [170px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (0.6) should be [140px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
-    expected: FAIL
-
   [Web Animations: property <width> from [200px\] to [fit-content\] at (-0.3) should be [230px\]]
     expected: FAIL
 
@@ -377,111 +218,6 @@
   [Web Animations: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
     expected: FAIL
 
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (-0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.3) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (0) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (0.3) should be [max-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (0.5) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (0.6) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (1) should be [min-content\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
-    expected: FAIL
-
   [Web Animations: property <width> from [max-content\] to [min-content\] at (-0.3) should be [max-content\]]
     expected: FAIL
 
@@ -503,60 +239,6 @@
   [Web Animations: property <width> from [max-content\] to [min-content\] at (1.5) should be [min-content\]]
     expected: FAIL
 
-  [CSS Transitions: property <width> from [max-content\] to neutral at (-0.3) should be [115px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to neutral at (0) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to neutral at (0.3) should be [85px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to neutral at (0.6) should be [70px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to neutral at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from [max-content\] to neutral at (1.5) should be [25px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (-0.3) should be [115px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (0) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (0.3) should be [85px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (0.6) should be [70px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from [max-content\] to neutral at (1.5) should be [25px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (-0.3) should be [115px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (0) should be [100px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (0.3) should be [85px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (0.6) should be [70px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (1) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from [max-content\] to neutral at (1.5) should be [25px\]]
-    expected: FAIL
-
   [Web Animations: property <width> from [max-content\] to neutral at (-0.3) should be [115px\]]
     expected: FAIL
 
@@ -575,60 +257,6 @@
   [Web Animations: property <width> from [max-content\] to neutral at (1.5) should be [25px\]]
     expected: FAIL
 
-  [CSS Transitions: property <width> from neutral to [min-content\] at (-0.3) should be [35px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0.3) should be [65px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (0.6) should be [80px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (-0.3) should be [35px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.3) should be [65px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.6) should be [80px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (-0.3) should be [35px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (0) should be [50px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (0.3) should be [65px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (0.6) should be [80px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Animations: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
-    expected: FAIL
-
   [Web Animations: property <width> from neutral to [min-content\] at (-0.3) should be [35px\]]
     expected: FAIL
 
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..9bafc27593e 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: 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 314dca9c1f5..ee1477240a1 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
@@ -1,3 +1,6 @@
 [MediaQueryList-addListener-removeListener.html]
   [listeners are called when <iframe> is resized]
     expected: FAIL
+
+  [removing listener from one MQL doesn't remove it from all MQLs]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/events/CustomEvent.html.ini b/tests/wpt/meta-legacy-layout/dom/events/CustomEvent.html.ini
deleted file mode 100644
index eea1173fab7..00000000000
--- a/tests/wpt/meta-legacy-layout/dom/events/CustomEvent.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[CustomEvent.html]
-  type: testharness
-  [initCustomEvent's default parameter values.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini b/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
index d8a3e1f25dd..0d9ac13a4c2 100644
--- a/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
@@ -107,9 +107,6 @@
   [EventTarget interface: calling removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean)) on new AbortController().signal with too few arguments must throw TypeError]
     expected: FAIL
 
-  [CustomEvent interface: operation initCustomEvent(DOMString, optional boolean, optional boolean, optional any)]
-    expected: FAIL
-
   [EventTarget interface: new AbortController().signal must inherit property "addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean))" with the proper type]
     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 e6ed5c4b6b5..0ba840e7fdc 100644
--- a/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
@@ -554,9 +554,6 @@
   [Element interface: operation after((Node or DOMString)...)]
     expected: FAIL
 
-  [CustomEvent interface: operation initCustomEvent(DOMString, optional boolean, optional boolean, optional any)]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
index 753b74c444f..541d324849e 100644
--- a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
@@ -53,6 +53,54 @@
   [from(): Throws 'callable' error when @@iterator property is a non-callable primitive]
     expected: FAIL
 
+  [from(): Async iterable protocol null, converts as iterator]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion]
+    expected: FAIL
+
+  [from(): Asynchronous iterable multiple in-flight subscriptions competing]
+    expected: FAIL
+
+  [from(): Asynchronous generator conversion: can only be used once]
+    expected: FAIL
+
+  [from(): Promise-wrapping semantics of IteratorResult interface]
+    expected: FAIL
+
+  [from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() GETTER are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Aborting sync iterable midway through iteration both stops iteration and invokes `IteratorRecord#return()]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion, with synchronous iterable fallback]
+    expected: FAIL
+
+  [from(): Generator finally block runs when subscription is aborted]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable completes]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable errors]
+    expected: FAIL
+
+  [from(): Async generator finally block run when subscription is aborted]
+    expected: FAIL
+
+  [from(): Async generator finally block runs when Observable completes]
+    expected: FAIL
+
+  [from(): Async generator finally block run when Observable errors]
+    expected: FAIL
+
 
 [observable-from.any.worker.html]
   [from(): Observable.from() is a function]
@@ -108,3 +156,51 @@
 
   [from(): Throws 'callable' error when @@iterator property is a non-callable primitive]
     expected: FAIL
+
+  [from(): Async iterable protocol null, converts as iterator]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion]
+    expected: FAIL
+
+  [from(): Asynchronous iterable multiple in-flight subscriptions competing]
+    expected: FAIL
+
+  [from(): Asynchronous generator conversion: can only be used once]
+    expected: FAIL
+
+  [from(): Promise-wrapping semantics of IteratorResult interface]
+    expected: FAIL
+
+  [from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() GETTER are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Aborting sync iterable midway through iteration both stops iteration and invokes `IteratorRecord#return()]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion, with synchronous iterable fallback]
+    expected: FAIL
+
+  [from(): Generator finally block runs when subscription is aborted]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable completes]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable errors]
+    expected: FAIL
+
+  [from(): Async generator finally block run when subscription is aborted]
+    expected: FAIL
+
+  [from(): Async generator finally block runs when Observable completes]
+    expected: FAIL
+
+  [from(): Async generator finally block run when Observable errors]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
index 22fa459058a..bf79f0682fd 100644
--- a/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
@@ -56,60 +56,6 @@
   [gb18030 decoder: GB18030-2022 18]
     expected: FAIL
 
-  [gb18030 decoder: GB18030-2022 19]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 20]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 21]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 22]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 23]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 24]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 25]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 26]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 27]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 28]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 29]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 30]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 31]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 32]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 33]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 34]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 35]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 36]
-    expected: FAIL
-
 
 [gb18030-decoder.any.html]
   [gb18030 decoder: two bytes 0xFE 0xFF]
@@ -168,57 +114,3 @@
 
   [gb18030 decoder: GB18030-2022 18]
     expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 19]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 20]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 21]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 22]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 23]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 24]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 25]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 26]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 27]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 28]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 29]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 30]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 31]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 32]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 33]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 34]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 35]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 36]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini b/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
index a758fbca55f..3eb82d3ee0c 100644
--- a/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
@@ -32,3 +32,113 @@
   [gbk encoder: legacy WebKit case 1]
     expected: FAIL
 
+  [gbk encoder: U+10FFFF]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 1]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 2]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 3]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 4]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 5]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 6]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 7]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 8]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 9]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 10]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 11]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 12]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 13]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 14]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 15]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 16]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 17]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 18]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 19]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 20]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 21]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 22]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 23]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 24]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 25]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 26]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 27]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 28]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 29]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 30]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 31]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 32]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 33]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 34]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 35]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 36]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
index f08e8a2918a..a4620cd6816 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
@@ -1,5 +1,5 @@
 [createImageBitmap-flipY.html]
-  expected: ERROR
+  expected: TIMEOUT
   [createImageBitmap from a vector SVGImageElement imageOrientation: "none", and drawImage on the created ImageBitmap]
     expected: NOTRUN
 
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
index f40514bce36..ffc69c8722c 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
@@ -1,3 +1,4 @@
 [2d.canvas.host.size.attributes.parse.minus.worker.html]
+  expected: CRASH
   [Parsing of non-negative integers]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini
new file mode 100644
index 00000000000..d571dfa4cf9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini
@@ -0,0 +1,2 @@
+[2d.canvas.host.size.large.worker.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/infrastructure/urls/base-url/document-base-url-window-initiator-is-not-opener.https.window.js.ini b/tests/wpt/meta-legacy-layout/html/infrastructure/urls/base-url/document-base-url-window-initiator-is-not-opener.https.window.js.ini
index 2ef0896e3b3..8b8af2b9c2e 100644
--- a/tests/wpt/meta-legacy-layout/html/infrastructure/urls/base-url/document-base-url-window-initiator-is-not-opener.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/infrastructure/urls/base-url/document-base-url-window-initiator-is-not-opener.https.window.js.ini
@@ -1,4 +1,3 @@
 [document-base-url-window-initiator-is-not-opener.https.window.html]
-  expected: TIMEOUT
   [window.open() gets base url from initiator not opener.]
     expected: [FAIL, PASS, TIMEOUT]
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 76e34322dca..4c03d0c5c3d 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -2,4 +2,4 @@
   type: testharness
   expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
similarity index 54%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
index 25e22c079b7..3a5e9a3d9dc 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
@@ -1,13 +1,4 @@
 [select-datalist-options-idl.tentative.html]
-  [Option elements should work if they are a descendant of a selects datalist.]
-    expected: FAIL
-
-  [Options in datalist should still work when the multiple attribute is added.]
-    expected: FAIL
-
-  [Options in datalist in multiple should work after re-parsing and re-attaching.]
-    expected: FAIL
-
   [Option elements should work if they are a descendant of a selects wrapper div.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
similarity index 76%
rename from tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
index 85465f58574..19b3d41fe42 100644
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
@@ -1,5 +1,5 @@
 [select-parsing.tentative.html]
-  [<button>s and <datalist>s should be allowed in <select>.]
+  [<div>s, <button>s, and <datalist>s should be allowed in <select>.]
     expected: FAIL
 
   [</select> should close <button>.]
@@ -14,11 +14,5 @@
   [<select> in <select><button><div> should remove inner <select>.]
     expected: FAIL
 
-  [Nested <button>s or <datalist>s in <select> should be dropped.]
-    expected: FAIL
-
-  [<div>s, <button>s, and <datalist>s should be allowed in <select>.]
-    expected: FAIL
-
   [Divs and imgs should be allowed as direct children of select and within options without a datalist.]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html.ini
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
deleted file mode 100644
index 64bbc4eb303..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-rendering.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-all-global-events.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
index 4048753c233..09f0bf3f769 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
@@ -509,3 +509,39 @@
 
   [onbeforetoggle: the content attribute must be compiled into a function as the corresponding property]
     expected: FAIL
+
+  [onauxclick: dispatching an Event at a <meta> element must trigger element.onauxclick]
+    expected: FAIL
+
+  [onbeforeinput: dispatching an Event at a <meta> element must trigger element.onbeforeinput]
+    expected: FAIL
+
+  [onbeforematch: dispatching an Event at a <meta> element must trigger element.onbeforematch]
+    expected: FAIL
+
+  [onbeforetoggle: dispatching an Event at a <meta> element must trigger element.onbeforetoggle]
+    expected: FAIL
+
+  [oncontextlost: dispatching an Event at a <meta> element must trigger element.oncontextlost]
+    expected: FAIL
+
+  [oncontextrestored: dispatching an Event at a <meta> element must trigger element.oncontextrestored]
+    expected: FAIL
+
+  [onscrollend: dispatching an Event at a <meta> element must trigger element.onscrollend]
+    expected: FAIL
+
+  [onslotchange: dispatching an Event at a <meta> element must trigger element.onslotchange]
+    expected: FAIL
+
+  [onwebkitanimationend: dispatching an Event at a <meta> element must trigger element.onwebkitanimationend]
+    expected: FAIL
+
+  [onwebkitanimationiteration: dispatching an Event at a <meta> element must trigger element.onwebkitanimationiteration]
+    expected: FAIL
+
+  [onwebkitanimationstart: dispatching an Event at a <meta> element must trigger element.onwebkitanimationstart]
+    expected: FAIL
+
+  [onwebkittransitionend: dispatching an Event at a <meta> element must trigger element.onwebkittransitionend]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
index 5956384c415..db3384aea06 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
@@ -173,3 +173,120 @@
 
   [shadowed pageswap removal (window)]
     expected: FAIL
+
+  [shadowed blur on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed messageerror on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagereveal on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageswap on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed rejectionhandled on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed focus removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed load removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed resize removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed scroll removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed afterprint removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed beforeprint removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed beforeunload removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed hashchange removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed languagechange removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed message removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed offline removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed online removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed pagehide removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed pageshow removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed popstate removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed storage removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed unload removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed focus removal (window)]
+    expected: FAIL
+
+  [shadowed load removal (window)]
+    expected: FAIL
+
+  [shadowed resize removal (window)]
+    expected: FAIL
+
+  [shadowed scroll removal (window)]
+    expected: FAIL
+
+  [shadowed afterprint removal (window)]
+    expected: FAIL
+
+  [shadowed beforeprint removal (window)]
+    expected: FAIL
+
+  [shadowed beforeunload removal (window)]
+    expected: FAIL
+
+  [shadowed hashchange removal (window)]
+    expected: FAIL
+
+  [shadowed languagechange removal (window)]
+    expected: FAIL
+
+  [shadowed message removal (window)]
+    expected: FAIL
+
+  [shadowed offline removal (window)]
+    expected: FAIL
+
+  [shadowed online removal (window)]
+    expected: FAIL
+
+  [shadowed pagehide removal (window)]
+    expected: FAIL
+
+  [shadowed pageshow removal (window)]
+    expected: FAIL
+
+  [shadowed popstate removal (window)]
+    expected: FAIL
+
+  [shadowed storage removal (window)]
+    expected: FAIL
+
+  [shadowed unload removal (window)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
index e9e0e011857..cb28d803fca 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
@@ -169,3 +169,69 @@
 
   [shadowed pageswap removal (window)]
     expected: FAIL
+
+  [shadowed blur on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed focus on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed load on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed resize on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed scroll on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed afterprint on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed beforeprint on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed beforeunload on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed hashchange on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed languagechange on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed message on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed messageerror on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed offline on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed online on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagehide on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagereveal on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageshow on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageswap on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed popstate on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed rejectionhandled on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed storage on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed unload on body fires when event dispatched on window]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/mimesniff/mime-types/charset-parameter.window.js.ini b/tests/wpt/meta-legacy-layout/mimesniff/mime-types/charset-parameter.window.js.ini
new file mode 100644
index 00000000000..6e917828ee0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/mimesniff/mime-types/charset-parameter.window.js.ini
@@ -0,0 +1,48 @@
+[charset-parameter.window.html]
+  [text/html;x=(;charset=gbk]
+    expected: FAIL
+
+  [text/html ;charset=gbk]
+    expected: FAIL
+
+  [text/html;charset= gbk]
+    expected: FAIL
+
+  [text/html;test;charset=gbk]
+    expected: FAIL
+
+  [text/html;test=;charset=gbk]
+    expected: FAIL
+
+  [text/html;';charset=gbk]
+    expected: FAIL
+
+  [text/html;";charset=gbk]
+    expected: FAIL
+
+  [text/html ; ; charset=gbk]
+    expected: FAIL
+
+  [text/html;;;;charset=gbk]
+    expected: FAIL
+
+  [text/html;charset= ";charset=GBK]
+    expected: FAIL
+
+  [text/html;charset=";charset=foo";charset=GBK]
+    expected: FAIL
+
+  [text/html;charset="gbk]
+    expected: FAIL
+
+  [text/html;charset="\\ gbk"]
+    expected: FAIL
+
+  [text/html;charset="\\g\\b\\k"]
+    expected: FAIL
+
+  [text/html;charset="gbk"x]
+    expected: FAIL
+
+  [text/html;test=ÿ;charset=gbk]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/mimesniff/mime-types/parsing.any.js.ini b/tests/wpt/meta-legacy-layout/mimesniff/mime-types/parsing.any.js.ini
new file mode 100644
index 00000000000..a79051c7fdd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/mimesniff/mime-types/parsing.any.js.ini
@@ -0,0 +1,6506 @@
+[parsing.any.html]
+  [TEXT/HTML;CHARSET=GBK (Blob/File)]
+    expected: FAIL
+
+  [TEXT/HTML;CHARSET=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=gbk( (Blob/File)]
+    expected: FAIL
+
+  [text/html;x=(;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=gbk;charset=windows-1255 (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=();charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset =gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html ;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html; charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= "gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0bgbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0bgbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=\x0cgbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0cgbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;\x0bcharset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;\x0bcharset=gbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;\x0ccharset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;\x0ccharset=gbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=';charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;test;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;';charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;";charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html ; ; charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;;;;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= ";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= ";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=";charset=foo";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=foo";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset="gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="\\ gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="\\g\\b\\k" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="gbk"x (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset={gbk} (Blob/File)]
+    expected: FAIL
+
+  [text/html;a\]=bar;b[=bar;c=bar (Blob/File)]
+    expected: FAIL
+
+  [text/html;in\]valid=";asd=foo";foo=bar (Blob/File)]
+    expected: FAIL
+
+  [!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (Blob/File)]
+    expected: FAIL
+
+  [!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\t !\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\t !\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" (Request/Response)]
+    expected: FAIL
+
+  [x/x;test (Blob/File)]
+    expected: FAIL
+
+  [x/x;test="\\ (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=  (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\t (Blob/File)]
+    expected: FAIL
+
+  [x/x\n\r\t ;x=x (Blob/File)]
+    expected: FAIL
+
+  [\n\r\t x/x;x=x\n\r\t  (Blob/File)]
+    expected: FAIL
+
+  [x/x;\n\r\t x=x\n\r\t ;x=y (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=ÿ;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=ÿ;charset=gbk (Request/Response)]
+    expected: FAIL
+
+  [x/x;test=�;x=x (Blob/File)]
+    expected: FAIL
+
+  [/ (Blob/File)]
+    expected: FAIL
+
+  [bogus (Blob/File)]
+    expected: FAIL
+
+  [bogus/ (Blob/File)]
+    expected: FAIL
+
+  [bogus/  (Blob/File)]
+    expected: FAIL
+
+  [bogus/bogus/; (Blob/File)]
+    expected: FAIL
+
+  [</> (Blob/File)]
+    expected: FAIL
+
+  [(/) (Blob/File)]
+    expected: FAIL
+
+  [text/html(;doesnot=matter (Blob/File)]
+    expected: FAIL
+
+  [{/} (Blob/File)]
+    expected: FAIL
+
+  [text /html (Blob/File)]
+    expected: FAIL
+
+  [text/ html (Blob/File)]
+    expected: FAIL
+
+  ["text/html" (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x00=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x00;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x00";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x01=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x01=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x01;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x01;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x01";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x01";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x02=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x02=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x02;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x02;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x02";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x02";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x03=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x03=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x03;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x03;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x03";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x03";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x04=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x04=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x04;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x04;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x04";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x04";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x05=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x05=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x05;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x05;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x05";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x05";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x06=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x06=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x06;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x06;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x06";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x06";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x07=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x07=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x07;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x07;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x07";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x07";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x08=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x08=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x08;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x08;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x08";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x08";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\t=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\n=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\n;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\n";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0b=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0b=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0b;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0b;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0b";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0b";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x0c=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0c=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0c;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0c;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0c";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0c";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\r=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\r;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\r";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0e=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0e=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0e;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0e;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0e";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0e";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x0f=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0f=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0f;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0f;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0f";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0f";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x10=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x10=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x10;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x10;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x10";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x10";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x11=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x11=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x11;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x11;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x11";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x11";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x12=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x12=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x12;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x12;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x12";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x12";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x13=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x13=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x13;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x13;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x13";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x13";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x14=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x14=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x14;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x14;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x14";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x14";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x15=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x15=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x15;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x15;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x15";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x15";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x16=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x16=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x16;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x16;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x16";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x16";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x17=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x17=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x17;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x17;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x17";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x17";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x18=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x18=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x18;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x18;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x18";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x18";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x19=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x19=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x19;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x19;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x19";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x19";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1a=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1a=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1a;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1a;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1a";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1a";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1b=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1b=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1b;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1b;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1b";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1b";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1c=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1c=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1c;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1c;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1c";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1c";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1d=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1d=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1d;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1d;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1d";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1d";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1e=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1e=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1e;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1e;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1e";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1e";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1f=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1f=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1f;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1f;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1f";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1f";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [ /x (Blob/File)]
+    expected: FAIL
+
+  [x/  (Blob/File)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  ["/x (Blob/File)]
+    expected: FAIL
+
+  [x/" (Blob/File)]
+    expected: FAIL
+
+  [x/x;"=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [(/x (Blob/File)]
+    expected: FAIL
+
+  [x/( (Blob/File)]
+    expected: FAIL
+
+  [x/x;(=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=(;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [)/x (Blob/File)]
+    expected: FAIL
+
+  [x/) (Blob/File)]
+    expected: FAIL
+
+  [x/x;)=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=);bonus=x (Blob/File)]
+    expected: FAIL
+
+  [,/x (Blob/File)]
+    expected: FAIL
+
+  [x/, (Blob/File)]
+    expected: FAIL
+
+  [x/x;,=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=,;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;/=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=/;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [:/x (Blob/File)]
+    expected: FAIL
+
+  [x/: (Blob/File)]
+    expected: FAIL
+
+  [x/x;:=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=:;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [;/x (Blob/File)]
+    expected: FAIL
+
+  [x/; (Blob/File)]
+    expected: FAIL
+
+  [</x (Blob/File)]
+    expected: FAIL
+
+  [x/< (Blob/File)]
+    expected: FAIL
+
+  [x/x;<=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=<;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [=/x (Blob/File)]
+    expected: FAIL
+
+  [x/= (Blob/File)]
+    expected: FAIL
+
+  [x/x;x==;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [>/x (Blob/File)]
+    expected: FAIL
+
+  [x/> (Blob/File)]
+    expected: FAIL
+
+  [x/x;>=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=>;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [?/x (Blob/File)]
+    expected: FAIL
+
+  [x/? (Blob/File)]
+    expected: FAIL
+
+  [x/x;?=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=?;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [@/x (Blob/File)]
+    expected: FAIL
+
+  [x/@ (Blob/File)]
+    expected: FAIL
+
+  [x/x;@=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=@;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [[/x (Blob/File)]
+    expected: FAIL
+
+  [x/[ (Blob/File)]
+    expected: FAIL
+
+  [x/x;[=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=[;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [\\/x (Blob/File)]
+    expected: FAIL
+
+  [x/\\ (Blob/File)]
+    expected: FAIL
+
+  [x/x;\\=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [\]/x (Blob/File)]
+    expected: FAIL
+
+  [x/\] (Blob/File)]
+    expected: FAIL
+
+  [x/x;\]=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\];bonus=x (Blob/File)]
+    expected: FAIL
+
+  [{/x (Blob/File)]
+    expected: FAIL
+
+  [x/{ (Blob/File)]
+    expected: FAIL
+
+  [x/x;{=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x={;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [}/x (Blob/File)]
+    expected: FAIL
+
+  [x/} (Blob/File)]
+    expected: FAIL
+
+  [x/x;}=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=};bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;€=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;€=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=€;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=€;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="€";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="€";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‚=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‚=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‚;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‚;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‚";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‚";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ƒ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ƒ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ƒ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ƒ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ƒ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ƒ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;„=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;„=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=„;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=„;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="„";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="„";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;…=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;…=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=…;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=…;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="…";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="…";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;†=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;†=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=†;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=†;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="†";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="†";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‡=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‡=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‡;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‡;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‡";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‡";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ˆ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ˆ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ˆ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ˆ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ˆ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ˆ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‰=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‰=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‰;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‰;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‰";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‰";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Š=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Š=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Š;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Š;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Š";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Š";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‹=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‹=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‹;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‹;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‹";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‹";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Œ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Œ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Œ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Œ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Œ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Œ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ž=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ž=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ž;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ž;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ž";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ž";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‘=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‘=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‘;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‘;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‘";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‘";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;’=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;’=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=’;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=’;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="’";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="’";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;“=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;“=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=“;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=“;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="“";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="“";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;”=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;”=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=”;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=”;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="”";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="”";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;•=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;•=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=•;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=•;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="•";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="•";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;–=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;–=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=–;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=–;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="–";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="–";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;—=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;—=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=—;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=—;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="—";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="—";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;˜=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;˜=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=˜;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=˜;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="˜";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="˜";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;™=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;™=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=™;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=™;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="™";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="™";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;š=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;š=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=š;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=š;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="š";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="š";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;›=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;›=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=›;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=›;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="›";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="›";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;œ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;œ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=œ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=œ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="œ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="œ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ž=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ž=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ž;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ž;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ž";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ž";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ÿ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ÿ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ÿ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ÿ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ÿ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ÿ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x= ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x= ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=" ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=" ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¡=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¡=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¡;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¡;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¡";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¡";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¢=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¢=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¢;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¢;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¢";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¢";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;£=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;£=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=£;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=£;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="£";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="£";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¤=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¤=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¤;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¤;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¤";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¤";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¥=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¥=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¥;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¥;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¥";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¥";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¦=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¦=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¦;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¦;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¦";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¦";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;§=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;§=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=§;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=§;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="§";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="§";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¨=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¨=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¨;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¨;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¨";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¨";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;©=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;©=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=©;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=©;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="©";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="©";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ª=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ª=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ª;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ª;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ª";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ª";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;«=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;«=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=«;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=«;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="«";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="«";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¬=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¬=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¬;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¬;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¬";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¬";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;­=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;­=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=­;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=­;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="­";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="­";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;®=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;®=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=®;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=®;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="®";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="®";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¯=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¯=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¯;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¯;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¯";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¯";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;°=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;°=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=°;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=°;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="°";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="°";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;±=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;±=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=±;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=±;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="±";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="±";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;²=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;²=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=²;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=²;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="²";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="²";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;³=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;³=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=³;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=³;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="³";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="³";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;´=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;´=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=´;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=´;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="´";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="´";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;µ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;µ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=µ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=µ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="µ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="µ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¶=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¶=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¶;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¶;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¶";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¶";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;·=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;·=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=·;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=·;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="·";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="·";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¸=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¸=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¸;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¸;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¸";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¸";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¹=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¹=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¹;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¹;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¹";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¹";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;º=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;º=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=º;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=º;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="º";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="º";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;»=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;»=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=»;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=»;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="»";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="»";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¼=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¼=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¼;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¼;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¼";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¼";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;½=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;½=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=½;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=½;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="½";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="½";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¾=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¾=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¾;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¾;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¾";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¾";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¿=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¿=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¿;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¿;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¿";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¿";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;À=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;À=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=À;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=À;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="À";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="À";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Á=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Á=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Á;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Á;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Á";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Á";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Â=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Â=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Â;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Â;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Â";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Â";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ã=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ã=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ã;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ã;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ã";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ã";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ä=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ä=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ä;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ä;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ä";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ä";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Å=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Å=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Å;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Å;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Å";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Å";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Æ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Æ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Æ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Æ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Æ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Æ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ç=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ç=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ç;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ç;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ç";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ç";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;È=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;È=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=È;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=È;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="È";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="È";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;É=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;É=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=É;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=É;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="É";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="É";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ê=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ê=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ê;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ê;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ê";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ê";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ë=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ë=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ë;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ë;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ë";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ë";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ì=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ì=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ì;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ì;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ì";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ì";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Í=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Í=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Í;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Í;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Í";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Í";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Î=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Î=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Î;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Î;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Î";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Î";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ï=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ï=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ï;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ï;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ï";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ï";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ð=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ð=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ð;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ð;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ð";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ð";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ñ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ñ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ñ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ñ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ñ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ñ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ò=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ò=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ò;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ò;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ò";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ò";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ó=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ó=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ó;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ó;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ó";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ó";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ô=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ô=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ô;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ô;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ô";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ô";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Õ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Õ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Õ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Õ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Õ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Õ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ö=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ö=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ö;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ö;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ö";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ö";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;×=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;×=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=×;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=×;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="×";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="×";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ø=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ø=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ø;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ø;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ø";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ø";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ù=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ù=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ù;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ù;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ù";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ù";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ú=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ú=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ú;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ú;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ú";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ú";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Û=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Û=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Û;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Û;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Û";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Û";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ü=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ü=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ü;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ü;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ü";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ü";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ý=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ý=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ý;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ý;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ý";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ý";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Þ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Þ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Þ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Þ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Þ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Þ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ß=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ß=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ß;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ß;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ß";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ß";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;à=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;à=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=à;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=à;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="à";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="à";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;á=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;á=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=á;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=á;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="á";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="á";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;â=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;â=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=â;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=â;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="â";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="â";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ã=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ã=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ã;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ã;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ã";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ã";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ä=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ä=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ä;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ä;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ä";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ä";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;å=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;å=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=å;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=å;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="å";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="å";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;æ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;æ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=æ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=æ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="æ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="æ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ç=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ç=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ç;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ç;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ç";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ç";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;è=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;è=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=è;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=è;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="è";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="è";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;é=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;é=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=é;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=é;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="é";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="é";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ê=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ê=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ê;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ê;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ê";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ê";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ë=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ë=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ë;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ë;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ë";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ë";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ì=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ì=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ì;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ì;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ì";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ì";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;í=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;í=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=í;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=í;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="í";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="í";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;î=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;î=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=î;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=î;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="î";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="î";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ï=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ï=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ï;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ï;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ï";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ï";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ð=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ð=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ð;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ð;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ð";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ð";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ñ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ñ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ñ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ñ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ñ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ñ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ò=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ò=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ò;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ò;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ò";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ò";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ó=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ó=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ó;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ó;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ó";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ó";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ô=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ô=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ô;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ô;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ô";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ô";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;õ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;õ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=õ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=õ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="õ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="õ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ö=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ö=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ö;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ö;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ö";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ö";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;÷=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;÷=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=÷;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=÷;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="÷";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="÷";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ø=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ø=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ø;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ø;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ø";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ø";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ù=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ù=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ù;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ù;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ù";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ù";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ú=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ú=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ú;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ú;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ú";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ú";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;û=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;û=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=û;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=û;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="û";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="û";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ü=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ü=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ü;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ü;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ü";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ü";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ý=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ý=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ý;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ý;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ý";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ý";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;þ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;þ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=þ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=þ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="þ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="þ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ÿ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ÿ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ÿ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ÿ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ÿ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ÿ";bonus=x (Request/Response)]
+    expected: FAIL
+
+
+[parsing.any.worker.html]
+  [TEXT/HTML;CHARSET=GBK (Blob/File)]
+    expected: FAIL
+
+  [TEXT/HTML;CHARSET=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=gbk( (Blob/File)]
+    expected: FAIL
+
+  [text/html;x=(;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=gbk;charset=windows-1255 (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=();charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset =gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html ;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html; charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= "gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0bgbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0bgbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=\x0cgbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=\x0cgbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;\x0bcharset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;\x0bcharset=gbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;\x0ccharset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;\x0ccharset=gbk (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=';charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;test;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;';charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;";charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html ; ; charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;;;;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= ";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset= ";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset=";charset=foo";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=foo";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset="gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="\\ gbk" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="\\g\\b\\k" (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="gbk"x (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset="";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=GBK (Blob/File)]
+    expected: FAIL
+
+  [text/html;charset=";charset=GBK (Request/Response)]
+    expected: FAIL
+
+  [text/html;charset={gbk} (Blob/File)]
+    expected: FAIL
+
+  [text/html;a\]=bar;b[=bar;c=bar (Blob/File)]
+    expected: FAIL
+
+  [text/html;in\]valid=";asd=foo";foo=bar (Blob/File)]
+    expected: FAIL
+
+  [!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (Blob/File)]
+    expected: FAIL
+
+  [!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\t !\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\t !\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" (Request/Response)]
+    expected: FAIL
+
+  [x/x;test (Blob/File)]
+    expected: FAIL
+
+  [x/x;test="\\ (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=  (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\t (Blob/File)]
+    expected: FAIL
+
+  [x/x\n\r\t ;x=x (Blob/File)]
+    expected: FAIL
+
+  [\n\r\t x/x;x=x\n\r\t  (Blob/File)]
+    expected: FAIL
+
+  [x/x;\n\r\t x=x\n\r\t ;x=y (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=ÿ;charset=gbk (Blob/File)]
+    expected: FAIL
+
+  [text/html;test=ÿ;charset=gbk (Request/Response)]
+    expected: FAIL
+
+  [x/x;test=�;x=x (Blob/File)]
+    expected: FAIL
+
+  [/ (Blob/File)]
+    expected: FAIL
+
+  [bogus (Blob/File)]
+    expected: FAIL
+
+  [bogus/ (Blob/File)]
+    expected: FAIL
+
+  [bogus/  (Blob/File)]
+    expected: FAIL
+
+  [bogus/bogus/; (Blob/File)]
+    expected: FAIL
+
+  [</> (Blob/File)]
+    expected: FAIL
+
+  [(/) (Blob/File)]
+    expected: FAIL
+
+  [text/html(;doesnot=matter (Blob/File)]
+    expected: FAIL
+
+  [{/} (Blob/File)]
+    expected: FAIL
+
+  [text /html (Blob/File)]
+    expected: FAIL
+
+  [text/ html (Blob/File)]
+    expected: FAIL
+
+  ["text/html" (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x00=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x00;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x00";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x01=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x01=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x01;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x01;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x01";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x01";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x02=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x02=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x02;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x02;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x02";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x02";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x03=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x03=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x03;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x03;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x03";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x03";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x04=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x04=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x04;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x04;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x04";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x04";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x05=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x05=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x05;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x05;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x05";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x05";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x06=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x06=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x06;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x06;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x06";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x06";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x07=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x07=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x07;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x07;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x07";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x07";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x08=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x08=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x08;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x08;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x08";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x08";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\t=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\n=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\n;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\n";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0b=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0b=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0b;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0b;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0b";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0b";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x0c=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0c=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0c;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0c;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0c";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0c";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\r=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\r;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\r";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0e=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0e=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0e;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0e;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0e";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0e";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x0f=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x0f=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x0f;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x0f;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x0f";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x0f";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x10=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x10=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x10;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x10;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x10";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x10";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x11=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x11=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x11;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x11;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x11";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x11";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x12=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x12=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x12;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x12;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x12";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x12";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x13=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x13=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x13;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x13;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x13";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x13";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x14=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x14=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x14;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x14;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x14";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x14";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x15=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x15=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x15;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x15;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x15";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x15";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x16=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x16=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x16;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x16;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x16";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x16";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x17=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x17=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x17;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x17;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x17";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x17";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x18=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x18=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x18;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x18;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x18";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x18";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x19=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x19=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x19;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x19;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x19";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x19";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1a=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1a=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1a;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1a;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1a";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1a";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1b=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1b=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1b;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1b;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1b";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1b";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1c=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1c=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1c;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1c;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1c";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1c";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1d=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1d=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1d;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1d;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1d";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1d";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1e=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1e=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1e;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1e;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1e";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1e";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;\x1f=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;\x1f=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=\x1f;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\x1f;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="\x1f";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="\x1f";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [ /x (Blob/File)]
+    expected: FAIL
+
+  [x/  (Blob/File)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  ["/x (Blob/File)]
+    expected: FAIL
+
+  [x/" (Blob/File)]
+    expected: FAIL
+
+  [x/x;"=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [(/x (Blob/File)]
+    expected: FAIL
+
+  [x/( (Blob/File)]
+    expected: FAIL
+
+  [x/x;(=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=(;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [)/x (Blob/File)]
+    expected: FAIL
+
+  [x/) (Blob/File)]
+    expected: FAIL
+
+  [x/x;)=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=);bonus=x (Blob/File)]
+    expected: FAIL
+
+  [,/x (Blob/File)]
+    expected: FAIL
+
+  [x/, (Blob/File)]
+    expected: FAIL
+
+  [x/x;,=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=,;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;/=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=/;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [:/x (Blob/File)]
+    expected: FAIL
+
+  [x/: (Blob/File)]
+    expected: FAIL
+
+  [x/x;:=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=:;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [;/x (Blob/File)]
+    expected: FAIL
+
+  [x/; (Blob/File)]
+    expected: FAIL
+
+  [</x (Blob/File)]
+    expected: FAIL
+
+  [x/< (Blob/File)]
+    expected: FAIL
+
+  [x/x;<=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=<;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [=/x (Blob/File)]
+    expected: FAIL
+
+  [x/= (Blob/File)]
+    expected: FAIL
+
+  [x/x;x==;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [>/x (Blob/File)]
+    expected: FAIL
+
+  [x/> (Blob/File)]
+    expected: FAIL
+
+  [x/x;>=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=>;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [?/x (Blob/File)]
+    expected: FAIL
+
+  [x/? (Blob/File)]
+    expected: FAIL
+
+  [x/x;?=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=?;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [@/x (Blob/File)]
+    expected: FAIL
+
+  [x/@ (Blob/File)]
+    expected: FAIL
+
+  [x/x;@=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=@;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [[/x (Blob/File)]
+    expected: FAIL
+
+  [x/[ (Blob/File)]
+    expected: FAIL
+
+  [x/x;[=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=[;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [\\/x (Blob/File)]
+    expected: FAIL
+
+  [x/\\ (Blob/File)]
+    expected: FAIL
+
+  [x/x;\\=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [\]/x (Blob/File)]
+    expected: FAIL
+
+  [x/\] (Blob/File)]
+    expected: FAIL
+
+  [x/x;\]=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=\];bonus=x (Blob/File)]
+    expected: FAIL
+
+  [{/x (Blob/File)]
+    expected: FAIL
+
+  [x/{ (Blob/File)]
+    expected: FAIL
+
+  [x/x;{=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x={;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [}/x (Blob/File)]
+    expected: FAIL
+
+  [x/} (Blob/File)]
+    expected: FAIL
+
+  [x/x;}=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=};bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;€=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;€=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=€;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=€;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="€";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="€";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‚=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‚=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‚;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‚;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‚";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‚";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ƒ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ƒ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ƒ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ƒ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ƒ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ƒ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;„=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;„=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=„;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=„;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="„";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="„";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;…=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;…=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=…;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=…;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="…";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="…";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;†=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;†=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=†;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=†;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="†";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="†";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‡=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‡=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‡;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‡;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‡";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‡";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ˆ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ˆ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ˆ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ˆ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ˆ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ˆ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‰=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‰=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‰;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‰;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‰";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‰";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Š=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Š=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Š;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Š;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Š";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Š";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‹=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‹=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‹;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‹;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‹";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‹";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Œ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Œ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Œ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Œ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Œ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Œ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ž=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ž=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ž;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ž;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ž";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ž";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;‘=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;‘=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=‘;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=‘;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="‘";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="‘";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;’=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;’=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=’;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=’;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="’";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="’";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;“=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;“=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=“;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=“;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="“";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="“";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;”=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;”=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=”;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=”;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="”";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="”";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;•=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;•=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=•;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=•;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="•";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="•";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;–=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;–=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=–;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=–;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="–";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="–";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;—=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;—=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=—;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=—;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="—";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="—";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;˜=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;˜=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=˜;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=˜;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="˜";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="˜";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;™=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;™=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=™;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=™;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="™";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="™";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;š=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;š=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=š;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=š;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="š";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="š";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;›=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;›=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=›;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=›;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="›";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="›";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;œ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;œ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=œ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=œ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="œ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="œ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ž=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ž=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ž;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ž;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ž";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ž";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ÿ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ÿ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ÿ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ÿ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ÿ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ÿ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x; =x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x= ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x= ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=" ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=" ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¡=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¡=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¡;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¡;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¡";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¡";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¢=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¢=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¢;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¢;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¢";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¢";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;£=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;£=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=£;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=£;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="£";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="£";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¤=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¤=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¤;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¤;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¤";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¤";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¥=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¥=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¥;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¥;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¥";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¥";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¦=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¦=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¦;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¦;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¦";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¦";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;§=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;§=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=§;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=§;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="§";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="§";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¨=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¨=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¨;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¨;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¨";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¨";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;©=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;©=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=©;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=©;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="©";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="©";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ª=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ª=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ª;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ª;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ª";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ª";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;«=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;«=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=«;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=«;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="«";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="«";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¬=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¬=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¬;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¬;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¬";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¬";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;­=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;­=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=­;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=­;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="­";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="­";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;®=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;®=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=®;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=®;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="®";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="®";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¯=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¯=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¯;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¯;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¯";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¯";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;°=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;°=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=°;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=°;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="°";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="°";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;±=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;±=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=±;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=±;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="±";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="±";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;²=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;²=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=²;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=²;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="²";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="²";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;³=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;³=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=³;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=³;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="³";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="³";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;´=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;´=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=´;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=´;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="´";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="´";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;µ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;µ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=µ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=µ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="µ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="µ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¶=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¶=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¶;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¶;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¶";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¶";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;·=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;·=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=·;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=·;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="·";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="·";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¸=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¸=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¸;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¸;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¸";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¸";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¹=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¹=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¹;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¹;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¹";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¹";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;º=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;º=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=º;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=º;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="º";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="º";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;»=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;»=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=»;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=»;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="»";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="»";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¼=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¼=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¼;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¼;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¼";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¼";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;½=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;½=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=½;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=½;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="½";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="½";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¾=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¾=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¾;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¾;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¾";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¾";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;¿=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;¿=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=¿;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=¿;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="¿";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="¿";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;À=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;À=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=À;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=À;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="À";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="À";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Á=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Á=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Á;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Á;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Á";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Á";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Â=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Â=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Â;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Â;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Â";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Â";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ã=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ã=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ã;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ã;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ã";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ã";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ä=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ä=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ä;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ä;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ä";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ä";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Å=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Å=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Å;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Å;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Å";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Å";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Æ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Æ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Æ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Æ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Æ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Æ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ç=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ç=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ç;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ç;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ç";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ç";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;È=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;È=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=È;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=È;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="È";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="È";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;É=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;É=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=É;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=É;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="É";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="É";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ê=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ê=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ê;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ê;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ê";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ê";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ë=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ë=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ë;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ë;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ë";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ë";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ì=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ì=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ì;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ì;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ì";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ì";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Í=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Í=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Í;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Í;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Í";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Í";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Î=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Î=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Î;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Î;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Î";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Î";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ï=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ï=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ï;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ï;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ï";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ï";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ð=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ð=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ð;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ð;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ð";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ð";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ñ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ñ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ñ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ñ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ñ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ñ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ò=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ò=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ò;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ò;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ò";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ò";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ó=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ó=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ó;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ó;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ó";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ó";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ô=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ô=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ô;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ô;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ô";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ô";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Õ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Õ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Õ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Õ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Õ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Õ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ö=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ö=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ö;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ö;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ö";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ö";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;×=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;×=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=×;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=×;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="×";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="×";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ø=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ø=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ø;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ø;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ø";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ø";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ù=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ù=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ù;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ù;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ù";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ù";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ú=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ú=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ú;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ú;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ú";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ú";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Û=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Û=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Û;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Û;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Û";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Û";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ü=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ü=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ü;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ü;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ü";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ü";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Ý=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Ý=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Ý;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Ý;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Ý";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Ý";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;Þ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;Þ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=Þ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=Þ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="Þ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="Þ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ß=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ß=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ß;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ß;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ß";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ß";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;à=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;à=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=à;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=à;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="à";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="à";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;á=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;á=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=á;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=á;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="á";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="á";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;â=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;â=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=â;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=â;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="â";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="â";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ã=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ã=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ã;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ã;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ã";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ã";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ä=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ä=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ä;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ä;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ä";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ä";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;å=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;å=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=å;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=å;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="å";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="å";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;æ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;æ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=æ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=æ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="æ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="æ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ç=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ç=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ç;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ç;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ç";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ç";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;è=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;è=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=è;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=è;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="è";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="è";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;é=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;é=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=é;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=é;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="é";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="é";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ê=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ê=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ê;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ê;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ê";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ê";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ë=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ë=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ë;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ë;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ë";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ë";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ì=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ì=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ì;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ì;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ì";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ì";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;í=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;í=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=í;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=í;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="í";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="í";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;î=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;î=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=î;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=î;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="î";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="î";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ï=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ï=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ï;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ï;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ï";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ï";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ð=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ð=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ð;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ð;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ð";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ð";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ñ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ñ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ñ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ñ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ñ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ñ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ò=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ò=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ò;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ò;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ò";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ò";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ó=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ó=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ó;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ó;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ó";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ó";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ô=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ô=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ô;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ô;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ô";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ô";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;õ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;õ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=õ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=õ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="õ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="õ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ö=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ö=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ö;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ö;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ö";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ö";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;÷=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;÷=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=÷;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=÷;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="÷";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="÷";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ø=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ø=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ø;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ø;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ø";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ø";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ù=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ù=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ù;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ù;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ù";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ù";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ú=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ú=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ú;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ú;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ú";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ú";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;û=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;û=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=û;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=û;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="û";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="û";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ü=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ü=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ü;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ü;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ü";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ü";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ý=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ý=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ý;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ý;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ý";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ý";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;þ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;þ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=þ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=þ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="þ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="þ";bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;ÿ=x;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;ÿ=x;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x=ÿ;bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x=ÿ;bonus=x (Request/Response)]
+    expected: FAIL
+
+  [x/x;x="ÿ";bonus=x (Blob/File)]
+    expected: FAIL
+
+  [x/x;x="ÿ";bonus=x (Request/Response)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/mimesniff/sniffing/html.window.js.ini b/tests/wpt/meta-legacy-layout/mimesniff/sniffing/html.window.js.ini
new file mode 100644
index 00000000000..6c1d1152623
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/mimesniff/sniffing/html.window.js.ini
@@ -0,0 +1,6 @@
+[html.window.html]
+  [HTML is not sniffed for a "feed": atom]
+    expected: FAIL
+
+  [HTML is not sniffed for a "feed": rss]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini b/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
index 4c0e53577a5..ed9f3683fb1 100644
--- a/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
+++ b/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
@@ -7,3 +7,12 @@
 
   [Reload navigationStart > Original navigationStart]
     expected: FAIL
+
+  [Reload domContentLoadedEventStart > Original domContentLoadedEventStart]
+    expected: FAIL
+
+  [Reload domInteractive > Original domInteractive]
+    expected: FAIL
+
+  [Reload fetchStart > Original fetchStart]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini b/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
index 1cf7cfe6976..82819a9241e 100644
--- a/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
+++ b/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
@@ -5,8 +5,5 @@
   [Property mask does not support quirky length]
     expected: FAIL
 
-  [Property object-position does not support quirky length]
-    expected: FAIL
-
   [Property column-span does not support quirky length]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/meta-legacy-layout/workers/semantics/run-a-worker/003.html.ini
index e083d83077b..f4318e59a8d 100644
--- a/tests/wpt/meta-legacy-layout/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/meta-legacy-layout/workers/semantics/run-a-worker/003.html.ini
@@ -1,4 +1,5 @@
 [003.html]
   type: testharness
+  expected: ERROR
   [shared]
     expected: FAIL
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index f692f8f9baf..5d809dda394 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -1098,6 +1098,20 @@
         {}
        ]
       ],
+      "image-in-fragmented-flexbox-001-crash.html": [
+       "3c8a6c52944da437e1d8a0b5e6cf35b766f2c1c0",
+       [
+        null,
+        {}
+       ]
+      ],
+      "image-in-fragmented-flexbox-002-crash.html": [
+       "a63c5be6c3e8910bc5bddb52e99bab54bfd1b385",
+       [
+        null,
+        {}
+       ]
+      ],
       "monolithic-item-in-fragmented-flexbox-crash.html": [
        "edf13244e1b4b5a8f29185f2aef52cde2c12445a",
        [
@@ -1205,6 +1219,13 @@
         {}
        ]
       ],
+      "grid-item-placement-multiple-crash.html": [
+       "6ce9d39ef628105dfa5cf735e6608196f5e57a69",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-large-end-border-crash.html": [
        "d2705f04f44d8e911837426d82bcd0296d9ac35c",
        [
@@ -1248,6 +1269,27 @@
        {}
       ]
      ],
+     "nested-fixedpos-in-inline-000-crash.html": [
+      "8d1d395e35c8a40faf07d688e6e51d34bc35e88f",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-fixedpos-in-inline-001-crash.html": [
+      "dc4e8fba67f2c5a801b529747def70946d723ede",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-fixedpos-in-inline-002-crash.html": [
+      "15a5a9633264d15709acdc48948c2d69c2c3cc31",
+      [
+       null,
+       {}
+      ]
+     ],
      "nested-float-in-multicol-crash.html": [
       "6878d384e54b0f3262cbbfb0552b9d19e707140d",
       [
@@ -1255,6 +1297,62 @@
        {}
       ]
      ],
+     "nested-multicol-with-spanner-and-oof-001-crash.html": [
+      "88b902af50283f87439e73fde9564cbb2bcba73a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-002-crash.html": [
+      "3a5b1da331116e86a6d16aaf8341cc5bf6a075aa",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-003-crash.html": [
+      "e6c1293e3b76488d9bd48fa8234ce4e78737be66",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-004-crash.html": [
+      "5db9163398a7fcbcf1ec76b69471d83891ece3bf",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-005-crash.html": [
+      "f7b56c1c985f43dca8b8849d78a8bba95f7a7b94",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-006-crash.html": [
+      "b969f925d3fa132a332fca462917f1f893973f05",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-007-crash.html": [
+      "861aac2bc3dd0e2af03372ac8b0b031f2501f93a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-multicol-with-spanner-and-oof-008-crash.html": [
+      "a8d0f3e77ea62d9976a5e1606e74cd0602a38b02",
+      [
+       null,
+       {}
+      ]
+     ],
      "nested-multicol-with-spanners-and-oofs-crash.html": [
       "d2e8ebb62196e2217e3e0594edb05618650e7aca",
       [
@@ -1535,6 +1633,19 @@
       ]
      ]
     },
+    "css-color-adjust": {
+     "rendering": {
+      "dark-color-scheme": {
+       "color-scheme-link-crash.html": [
+        "53470ee9af2dc2fcc56e52f10da0885af3b27592",
+        [
+         null,
+         {}
+        ]
+       ]
+      }
+     }
+    },
     "css-conditional": {
      "container-queries": {
       "crashtests": {
@@ -2877,6 +2988,19 @@
       ]
      ]
     },
+    "css-masking": {
+     "clip-path": {
+      "animations": {
+       "clip-path-transition-crash.html": [
+        "103a0da2a60a7c00bb12eb941ebceec94f318d47",
+        [
+         null,
+         {}
+        ]
+       ]
+      }
+     }
+    },
     "css-multicol": {
      "abspos-in-multicol-with-spanner-crash.html": [
       "c30a19d001b530c304def61e1e6d55dc0f6b0318",
@@ -3860,6 +3984,13 @@
       ]
      ],
      "line-clamp": {
+      "line-clamp-auto-001-crash.html": [
+       "9185f9802de563fa9b838709b648342d45d72fc8",
+       [
+        null,
+        {}
+       ]
+      ],
       "webkit-line-clamp-041-crash.html": [
        "3f4bf3c8ef578fa22469e81e504879aa5d713bf8",
        [
@@ -6206,7 +6337,7 @@
       ]
      ],
      "insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html": [
-      "f5f981965ba99aaf1f9ab0965238222094114a77",
+      "aa40ad9696fc1df42ea15840902c7734bf962ff5",
       [
        null,
        {}
@@ -7002,6 +7133,13 @@
          {}
         ]
        ],
+       "iframe-loading-lazy-simple-crash.html": [
+        "b0b251438f73811ce2ec4d82fe47ffb3a2445c93",
+        [
+         null,
+         {}
+        ]
+       ],
        "multiple-iframes-with-allow-scripts-crash.html": [
         "572f119be8e41130c62eb5a01ba4b9c8c0832080",
         [
@@ -21495,7 +21633,7 @@
    },
    "file-system-access": {
     "local_FileSystemBaseHandle-IndexedDB-manual.https.html": [
-     "f9a58d457fc1b122fa8cdd02e9053a359ffa52e7",
+     "256921f397ecc887434871eef8ce73711c0256ae",
      [
       null,
       {}
@@ -21516,56 +21654,56 @@
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html": [
-     "3981372df03673d591ca57dfc0c259fcc1be0dee",
+     "a41b519a9d03ba2bbf76c68c10940d0476a0b707",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-Error-manual.https.html": [
-     "b872839f2a8ecb3a3875d9f07c0223a0e6fddb8a",
+     "6e82dfb7e297595ccf88f363fffa9668317058a3",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html": [
-     "3ec98c86c0cf9859d1a11cf4230fdccf7af78ebf",
+     "f00d64b45fbce54f46538447ab13648076c0c381",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html": [
-     "359f11cd171550b476f1140dc8e6d92d46998fcc",
+     "4e0e56de753058c5230ea80a2ae8087b024cccfa",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html": [
-     "af0d6169095c7cdea0b1ccdb572321a180a1c22a",
+     "b56fb58fe3530f70f9e9aeb63e521e6fb8b4dab9",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-frames-manual.https.html": [
-     "1581a645a5be154bb44f27b6b4f590670f8c9f97",
+     "c6b4e2e942e442636bc8bc169c6c1bcbd281c5c1",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-windows-manual.https.html": [
-     "21fd7cb274620503cf1f798d03bb0d817e76abcc",
+     "b5cb47c6fdae84dd24089583fd6fd93df907e13f",
      [
       null,
       {}
      ]
     ],
     "local_FileSystemBaseHandle-postMessage-workers-manual.https.html": [
-     "f30ecddd9afa66e0b37da4aa3a4747b741adac7c",
+     "e39dcc22f0f075fd96797669187ba984f9aa9cdd",
      [
       null,
       {}
@@ -124255,6 +124393,45 @@
     },
     "css-backgrounds": {
      "animations": {
+      "background-color-animation-custom-property.html": [
+       "e6c76ed5b839be7d9ca41f690703c5b898a0593a",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/background-color-animation-custom-property-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "background-color-animation-custom-timing-function-reverse.html": [
+       "00ec4c17261a538d43cfcaf46ec967af57aaa77d",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "background-color-animation-custom-timing-function.html": [
+       "69d5f542c556cb5b08493fc1cfc5b09d42fd3048",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/background-color-animation-custom-timing-function-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "background-color-animation-element-not-visible-at-current-viewport.html": [
        "db212e39926789f8b27d06b2a16a0f77046ef3cd",
        [
@@ -199562,7 +199739,7 @@
      },
      "text-box-trim": {
       "text-box-trim-accumulation-001.html": [
-       "2429640f284459341d1494856386fd8a3013de54",
+       "ae6765f6f64dafcd038eb584a18f677d82bb97c0",
        [
         null,
         [
@@ -199964,7 +200141,7 @@
        ]
       ],
       "text-box-trim-height-002.html": [
-       "a3743e4bf9fac7b7938bb8dcb90795e93c9e941a",
+       "d2d59d46d037b7433fbcf9fc2730622b67b9a889",
        [
         null,
         [
@@ -206745,6 +206922,19 @@
         }
        ]
       ],
+      "clip-path-rect-004.html": [
+       "0a25d8fa5ef2fedd756e1fb874ab0e2716c2441b",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-reference-box-001.html": [
        "35b31ebaef1fc184e7f4e6202093d650e6b1db65",
        [
@@ -216627,7 +216817,7 @@
       ]
      ],
      "incremental-scroll.html": [
-      "be1a1cbb74c33394a2ab3afd0a14eb635818fc23",
+      "bed408c5c471c30d310e7d72e311d0080c5713fc",
       [
        null,
        [
@@ -217472,6 +217662,45 @@
         {}
        ]
       ],
+      "line-clamp-auto-035.tentative.html": [
+       "67e04e27f5f755a14816fb06b530a97796ccc8af",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-auto-036.tentative.html": [
+       "27b97e00ade3dcbb9f09f87c83955df9fbced499",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-auto-036-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-auto-037.tentative.html": [
+       "4a2fc3c82064e12b5ff282c56f4e3a03035ee9e9",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-auto-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "line-clamp-auto-with-ruby-001.tentative.html": [
        "5f69cc1b71e9eaeceacbbb87140349b5d7590a8c",
        [
@@ -235064,6 +235293,19 @@
         {}
        ]
       ],
+      "block-aspect-ratio-058.html": [
+       "b6d923f12bc42fcdacbce81b6bc5d1689d888b1b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "block-aspect-ratio-with-margin-collapsing-001.html": [
        "78a0418fe285da58030cdd863460add0533e6af5",
        [
@@ -239400,7 +239642,7 @@
       ]
      ],
      "intrinsic-percent-replaced-017.html": [
-      "190b2f8fe4435f082c01b21876c5168139bc562b",
+      "d7e5d70e43af7943e19b358ec80a5cff259dc02e",
       [
        null,
        [
@@ -239451,6 +239693,45 @@
        {}
       ]
      ],
+     "intrinsic-percent-replaced-021.html": [
+      "8feec748cb2be27d44a02688a07dafe02e55dd55",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-022.html": [
+      "c8b114d8de1ecacdc5d61374984a1cb623297f1a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-023.html": [
+      "b3d87a0972266b97d851170c5f9525ff24eb2af3",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "intrinsic-percent-replaced-dynamic-001.html": [
       "1128ffa1759f26011c0639d8b5f498322c6396ac",
       [
@@ -262339,6 +262620,19 @@
        {}
       ]
      ],
+     "text-emphasis-position-auto-001.html": [
+      "09e4be9515f60056e8898693f299a6d83154e71f",
+      [
+       null,
+       [
+        [
+         "/css/css-text-decor/text-emphasis-position-auto-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-emphasis-position-default-001.html": [
       "072a0058423e0cf2195eea17a59560be35f5605a",
       [
@@ -293714,7 +294008,7 @@
       ]
      ],
      "element-is-grouping-during-animation.html": [
-      "b1ef745e0dba3e60022921cdf60deea4116791be",
+      "93c4861ef1030f6d54a71a85cb34254975d57035",
       [
        null,
        [
@@ -294232,6 +294526,170 @@
        {}
       ]
      ],
+     "layered-capture": {
+      "opacity-capture-observable-when-flat.tentative.html": [
+       "6d4ddbe86b175ff0cae19b3ed4a4cb0d827e22ec",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/layered-capture/nested-opacity-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             515
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "tree-effects.tentative.sub.html": [
+       "31bb324e633117f3a2e4fd7d6fb0826fae4dce0b",
+       [
+        "css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html?prop=clip-path&old=inset(10px 10px)&new=inset(20px 20px)",
+        [
+         [
+          "/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html?prop=clip-path&old=inset(10px 10px)&new=inset(20px 20px)",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             10
+            ],
+            [
+             0,
+             200000
+            ]
+           ]
+          ]
+         ]
+        }
+       ],
+       [
+        "css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html?prop=filter&old=blur(3px)&new=blur(10px)",
+        [
+         [
+          "/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html?prop=filter&old=blur(3px)&new=blur(10px)",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             10
+            ],
+            [
+             0,
+             200000
+            ]
+           ]
+          ]
+         ]
+        }
+       ],
+       [
+        "css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html?prop=mask&old=linear-gradient(red,blue) luminance&new=none",
+        [
+         [
+          "/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html?prop=mask&old=linear-gradient(red,blue) luminance&new=none",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             10
+            ],
+            [
+             0,
+             200000
+            ]
+           ]
+          ]
+         ]
+        }
+       ],
+       [
+        "css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html?prop=mask-image&old=linear-gradient(rgb(0 0 0 / 80%), transparent)&new=none",
+        [
+         [
+          "/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html?prop=mask-image&old=linear-gradient(rgb(0 0 0 / 80%), transparent)&new=none",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             10
+            ],
+            [
+             0,
+             200000
+            ]
+           ]
+          ]
+         ]
+        }
+       ],
+       [
+        "css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html?prop=opacity&old=0.3&new=1",
+        [
+         [
+          "/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html?prop=opacity&old=0.3&new=1",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             10
+            ],
+            [
+             0,
+             200000
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ]
+     },
      "massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html": [
       "65b14a6c4b85f90ba382dbb93e3fd591c8be85f7",
       [
@@ -295097,7 +295555,7 @@
        ]
       ],
       "root-element-transition-iframe-with-startVT-on-main.html": [
-       "b7ef426121c3435587f8cb33d05957e9aab019e9",
+       "2a86f629acf8e998e292954faed7117e07eac7db",
        [
         null,
         [
@@ -295331,7 +295789,7 @@
        ]
       ],
       "compute-explicit-name-nested-vt-names.tentative.html": [
-       "b5b12197712657f1e917162b37482465dbd48487",
+       "dcf56b500f4ab0ce732221f0ff412c38a1040381",
        [
         null,
         [
@@ -295765,6 +296223,122 @@
         }
        ]
       ],
+      "opacity-backdrop-blend-animated.tentative.html": [
+       "835f068c49211a10e0d8259953a918ffd5f2236b",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/nested/nested-opacity-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             515
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "opacity-backdrop-blend.tentative.html": [
+       "ea8acfc86b070ca375d4ebda54d48c6a42018696",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/nested/nested-opacity-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             515
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "opacity-resets-after-done.tentative.html": [
+       "7616638dc5ee816a3f9c9442a00eea3e32c73741",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/nested/nested-opacity-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             515
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "opacity-resets-after-skip.tentative.html": [
+       "e7a11ebe33125707f381c15f848c5f10ed25d50a",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/nested/nested-opacity-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             515
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "render-element.tentative.html": [
        "59a5a108314c0270b561339bf9a8a0cb6fdfe27d",
        [
@@ -295796,7 +296370,7 @@
       ]
      },
      "new-and-old-sizes-match.html": [
-      "70b6515fb5b8189c925127636f7860ae424f0284",
+      "f23f63d28ffa31c185858d5af8f639a905329ad8",
       [
        null,
        [
@@ -295812,11 +296386,11 @@
           [
            [
             0,
-            1
+            15
            ],
            [
             0,
-            300
+            500
            ]
           ]
          ]
@@ -295880,7 +296454,7 @@
       ]
      ],
      "new-content-captures-different-size.html": [
-      "18f323c32075bc9f10d6f007ab18eb2caad3812f",
+      "eeb7347981daac829fd17d85ada19730fe22af32",
       [
        null,
        [
@@ -295896,11 +296470,11 @@
           [
            [
             0,
-            40
+            100
            ],
            [
             0,
-            30000
+            15000
            ]
           ]
          ]
@@ -296582,7 +297156,7 @@
       ]
      ],
      "old-content-captures-different-size.html": [
-      "7f3be742b0d400d17e3aba73360a9c9dd6de6c02",
+      "0a97c6db4d08b5bcafbb29f1135ba26123020fb6",
       [
        null,
        [
@@ -296598,7 +297172,7 @@
           [
            [
             0,
-            40
+            50
            ],
            [
             0,
@@ -297793,7 +298367,7 @@
       ]
      ],
      "transform-origin-view-transition-group.html": [
-      "17a8218b76964d899c548dbae3e11292f8feffa7",
+      "328d35c33b6abb9f97649641d430936a8e7a4058",
       [
        null,
        [
@@ -297802,7 +298376,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            150
+           ],
+           [
+            0,
+            1000
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "transformed-element-scroll-transform.html": [
@@ -311783,12 +312373,12 @@
       ]
      ],
      "table-progression-htb-002.html": [
-      "4007e0400f892dcd591a54197f59a5a03a874f97",
+      "4e875054f85af479a36eb1e0c2321ee059d939be",
       [
        null,
        [
         [
-         "/css/css-writing-modes/table-progression-002-ref.html",
+         "/css/css-writing-modes/table-progression-htb-002-ref.html",
          "=="
         ]
        ],
@@ -336615,40 +337205,14 @@
        ]
       },
       "the-select-element": {
-       "reset-algorithm-rendering.html": [
-        "67da173ff2eb0d90c063294db486eaa34ea8878a",
-        [
-         null,
-         [
-          [
-           "/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "stylable-select": {
+       "customizable-select": {
         "appearance-base-select-other-elements.tentative.html": [
          "b0b98b74f941ac9956e73c3e7c58a0bb5de7b21f",
          [
           null,
           [
            [
-            "/html/semantics/forms/the-select-element/stylable-select/appearance-base-select-other-elements-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "border-rendering.tentative.html": [
-         "3265143624b3feb89d723acd4819917c63518219",
-         [
-          null,
-          [
-           [
-            "/html/semantics/forms/the-select-element/stylable-select/border-rendering-ref.html",
+            "/html/semantics/forms/the-select-element/customizable-select/appearance-base-select-other-elements-ref.html",
             "=="
            ]
           ],
@@ -336661,7 +337225,7 @@
           null,
           [
            [
-            "/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering-ref.html",
+            "/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering-ref.html",
             "=="
            ]
           ],
@@ -336674,14 +337238,27 @@
           null,
           [
            [
-            "/html/semantics/forms/the-select-element/stylable-select/select-size-multiple-new-content-ref.html",
+            "/html/semantics/forms/the-select-element/customizable-select/select-size-multiple-new-content-ref.html",
             "=="
            ]
           ],
           {}
          ]
         ]
-       }
+       },
+       "reset-algorithm-rendering.html": [
+        "67da173ff2eb0d90c063294db486eaa34ea8878a",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
       },
       "the-selectlist-element": {
        "button-type-selectlist-appearance.tentative.html": [
@@ -353303,7 +353880,7 @@
     ],
     "workflows": {
      "check-workflow-run.yml": [
-      "87670651d9863a3c7bff6ed45af46b33000b088c",
+      "4b7e6575db6d26cc442e023b64d4ee82173637fa",
       []
      ],
      "docker.yml": [
@@ -353331,11 +353908,11 @@
       []
      ],
      "safari_stable.yml": [
-      "88f1e72ecc212261ba80e7ebc53f25e540e86bcf",
+      "0df13f43d4403b5aa5bf61868849f7ce37832168",
       []
      ],
      "safari_technology_preview.yml": [
-      "7c02951813be627b2b267701df089f12c921723f",
+      "01380aa718e325b5a4b31b4db1833afe0afb8a93",
       []
      ],
      "wpt_fyi_notify.yml": [
@@ -353655,15 +354232,15 @@
     ],
     "derive_bits_keys": {
      "cfrg_curves_bits.js": [
-      "da809278a87aa51d8ba726c43d5c0e209dfbae59",
+      "8ab9db7bf71318b6b030f32ab7b8bd2554efa3e1",
       []
      ],
      "cfrg_curves_bits_fixtures.js": [
-      "ffdeb51eab97005bb7e7927cb25e37491027285a",
+      "c376c75bfe6cf83db77c00dd7b7d47dccd29d142",
       []
      ],
      "cfrg_curves_keys.js": [
-      "81244ba05a876614cf2777528fdaf5deac7298aa",
+      "62f9e00aa338468f1a33a5fe91931378a4a72cad",
       []
      ],
      "derived_bits_length.js": [
@@ -353748,9 +354325,17 @@
      ]
     },
     "import_export": {
+     "okp_importKey.js": [
+      "5699341d9e49d4ab5af1cf4bc33fa515d969f01e",
+      []
+     ],
      "okp_importKey_failures.js": [
       "ebdb73616d658146152ebddb3fbd27eaf8b49c26",
       []
+     ],
+     "okp_importKey_fixtures.js": [
+      "58b41d52601eb9b7175d546a87027639887f9a75",
+      []
      ]
     },
     "sign_verify": {
@@ -353763,7 +354348,7 @@
       []
      ],
      "eddsa.js": [
-      "de9a5268827d75217cc9e1b9f9f69af88049e52f",
+      "4024674e3c3d7f0500cfc10192714de392e4db1d",
       []
      ],
      "eddsa_small_order_points.js": [
@@ -353771,7 +354356,7 @@
       []
      ],
      "eddsa_vectors.js": [
-      "ce80e0ea7e262675165db685106fe118c247bee3",
+      "78240586c2e34c9a02f9c315c3f2f47d823817a1",
       []
      ],
      "hmac.js": [
@@ -357844,7 +358429,7 @@
    },
    "compute-pressure": {
     "README.md": [
-     "7695c4a33e328a01434196d5fa19af84e04bc57b",
+     "2b92e470ac19b59777ee39b82ebd7b3bd85763f1",
      []
     ],
     "WEB_FEATURES.yml": [
@@ -357866,6 +358451,10 @@
      ]
     },
     "resources": {
+     "common.js": [
+      "4f666f1557e42dd290de2d23c997bb2fb33b57db",
+      []
+     ],
      "compute-pressure-allowed-by-permissions-policy-worker.js": [
       "590ac52cfd06ef2b496d0decc70291fe32843b68",
       []
@@ -357881,6 +358470,10 @@
      "support-iframe.html": [
       "6b2b3097926b192df23c3e21dd19742bb19e69d4",
       []
+     ],
+     "worker-support.js": [
+      "998bcd66610ba1a8e329b32e4ef6660804247332",
+      []
      ]
     }
    },
@@ -378123,6 +378716,14 @@
     },
     "partitioned-cookies": {
      "resources": {
+      "ancestor-chain-cross-site-embed.html": [
+       "fbe2906737d5c4bf543022e2c443908e4a5159b5",
+       []
+      ],
+      "ancestor-chain-same-site-embed.html": [
+       "f40364379514854a7acb5d56a9e85b2c7200e4c3",
+       []
+      ],
       "partitioned-cookies-cross-site-embed.html": [
        "05a99626dc4211c64b9e092366e0e3ed4933ab39",
        []
@@ -396453,6 +397054,18 @@
        "0d5911d01d5cec0d737aae75aa477d5719c6dcd5",
        []
       ],
+      "background-color-animation-custom-property-ref.html": [
+       "df27400fc121dd26267ab9af5a971557fcb67b6b",
+       []
+      ],
+      "background-color-animation-custom-timing-function-ref.html": [
+       "64bbf8e0f320dd40e8a412f7d5229adfb4a70a78",
+       []
+      ],
+      "background-color-animation-custom-timing-function-reverse-ref.html": [
+       "830948959a93211aa6a4a3c58458de60454b316e",
+       []
+      ],
       "background-color-animation-element-not-visible-at-current-viewport-ref.html": [
        "e47a83e393b77657869eceb7786bbf3e61ae4b07",
        []
@@ -400317,7 +400930,7 @@
       ],
       "support": {
        "cq-testcommon.js": [
-        "2eaca1dd091cbf7c3a406fa02c2696d7a9c258e4",
+        "672a7e9646e26229f9419d94137aaa1f7ea2e48e",
         []
        ],
        "test.vtt": [
@@ -415944,7 +416557,7 @@
        []
       ],
       "text-box-trim-half-leading-block-box-001-ref.html": [
-       "403eee5f842542f336ae2fff9e2640bc1cd811b9",
+       "4aaf3375abbdfcd9c79738d63285486011e2ffcc",
        []
       ],
       "text-box-trim-half-leading-block-box-002-ref.html": [
@@ -415960,7 +416573,7 @@
        []
       ],
       "text-box-trim-height-002-ref.html": [
-       "ae6a271312f04f0cce103ea593a3396de5049626",
+       "dc9855663c61014a6bcec611cd33a1f0645635b6",
        []
       ],
       "text-box-trim-ignore-nested-text-box-edge-ref.html": [
@@ -415972,7 +416585,7 @@
        []
       ],
       "text-box-trim-initial-letter-start-001-ref.html": [
-       "c1baf7957f7aa3b5b1fa3599f9d9807f235a667b",
+       "7a3adc8b7e2082ab9c3fc3ef7abf2e4cb3996cc7",
        []
       ],
       "text-box-trim-line-clamp-001-ref.html": [
@@ -416800,10 +417413,6 @@
         "7e0d2a54266f3855dbc8e8e87167a06ea0cc323b",
         []
        ],
-       "clip-path-transition-crashtest.html": [
-        "103a0da2a60a7c00bb12eb941ebceec94f318d47",
-        []
-       ],
        "clip-path-transition-ref.html": [
         "af164c30f06808c3394cf3210ca13bc41792d53c",
         []
@@ -418789,13 +419398,17 @@
         []
        ],
        "line-clamp-auto-032-ref.html": [
-        "3b32f988cd91c6c3acf65a3368788a44d6850eea",
+        "4768c77ddabc93d3519e671c10d584b12e8a69ad",
         []
        ],
        "line-clamp-auto-034-ref.html": [
         "8fae3b278c124db00b8f79eb0cd0b91cb8752217",
         []
        ],
+       "line-clamp-auto-036-ref.html": [
+        "0ad96e88d14a735ce9416dba2b31f5f66936b19f",
+        []
+       ],
        "line-clamp-auto-with-ruby-001-ref.html": [
         "03d12b9c722c8c160830cc01997baa3ee4cf88c3",
         []
@@ -428976,6 +429589,10 @@
       "b88ca7c3a35a8e6d2e12e38ef8eef4dccbdf5b9d",
       []
      ],
+     "text-emphasis-position-auto-001-ref.html": [
+      "2a50e456112295a9ab3a98347d8b97a9f7b9f041",
+      []
+     ],
      "text-emphasis-position-default-001-ref.html": [
       "c177fbcb080bc1d6a2b8be92d04fc11346c2a62f",
       []
@@ -433274,6 +433891,12 @@
       "ac05756f050ed5afcc13f8e9e925978a558762d2",
       []
      ],
+     "layered-capture": {
+      "nested-opacity-ref.html": [
+       "7db20046e030aaa08582d44e3024cafe93f3fb2a",
+       []
+      ]
+     },
      "massive-element-below-and-on-top-of-viewport-partially-onscreen-ref.html": [
       "e251196cbf8e2535e7df168e163c5de6fc0c9d46",
       []
@@ -433471,6 +434094,10 @@
       ]
      },
      "nested": {
+      "nested-opacity-ref.html": [
+       "7db20046e030aaa08582d44e3024cafe93f3fb2a",
+       []
+      ],
       "nested-ref-100.html": [
        "dde4f026c36a11a40aef594ccfdc89d6f573120b",
        []
@@ -433485,7 +434112,7 @@
         []
        ],
        "compute-test.js": [
-        "4867c689f367f62456f91cdf09a4fed819d1580c",
+        "f71cf27b2504163ccb47e5253dcbe3b26deb1226",
         []
        ]
       }
@@ -439477,11 +440104,11 @@
     ],
     "support": {
      "helper.js": [
-      "60be755fa0ee926d2eafaff30056c3579e519e7e",
+      "0b71ae9822a7272caa7bb5e317e597330a857692",
       []
      ],
      "iframe.html": [
-      "0598cfb00be418f0f799f0d928d69539760ae587",
+      "6f3c072f29f9681042e55f044badf138304108c6",
       []
      ]
     },
@@ -439829,7 +440456,7 @@
       []
      ],
      "testdriver.md": [
-      "b1428b6af71f0210e554d4de7cc41a393a03451e",
+      "a9e58c36d8472454011c9ba5df44445c5a7512e6",
       []
      ],
      "testharness-api.md": [
@@ -440669,7 +441296,7 @@
       []
      ],
      "indent.js": [
-      "4dd7d1feee04c1b36339524b45efd08318481bc6",
+      "0265552f0939e3c803b452f965c2a2ce85000dc5",
       []
      ],
      "insert-list-items-in-table-cells.js": [
@@ -445325,7 +445952,7 @@
       ]
      },
      "local-fs-test-helpers.js": [
-      "4bb9793085ad8395e603a1b301b72648e841ded5",
+      "a4c0b8bdd39f231cc70466116c746d7512d13001",
       []
      ],
      "opaque-origin-sandbox.html": [
@@ -445360,7 +445987,7 @@
        []
       ],
       "ba-fledge-util.sub.js": [
-       "c534a8a6c624dfc88f050d968d72fa0c14b14aea",
+       "0bffebfeb94bc433e7ac03019b1aadfbf194b61c",
        []
       ],
       "ba-public-keys": [
@@ -446819,11 +447446,11 @@
       []
      ],
      "messaging-blob-helpers.js": [
-      "852f2e2d3213075ce738fbc2bb5ac4a1f4008ad6",
+      "a95d13f2d72ba4a445c2c0bc8df17ad7b9c0639e",
       []
      ],
      "messaging-helpers.js": [
-      "776c0c50d56b730826192d914da7ee0653dc0f03",
+      "300412a693d12ebd91bbdf8da0e9336d86d1c72c",
       []
      ],
      "messaging-serialize-helpers.js": [
@@ -446835,7 +447462,7 @@
       []
      ],
      "sandboxed-fs-test-helpers.js": [
-      "400b2c507b7fa3f41e06fb6bf1efc30098e69d25",
+      "679f409ca902444d29939c832f2b2e7d533ee0df",
       []
      ],
      "sync-access-handle-test.js": [
@@ -446849,7 +447476,7 @@
     },
     "script-tests": {
      "FileSystemBaseHandle-IndexedDB.js": [
-      "9e114619bf2caad6bbf53d25035c880818910dfa",
+      "75cb7bdde8ce36eafe3b16bb5d3889b67b6e1e59",
       []
      ],
      "FileSystemBaseHandle-buckets.js": [
@@ -447726,7 +448353,7 @@
          []
         ],
         "executor-window.py": [
-         "733d36b15edcdec6a957866942aad0d82ac6cc43",
+         "c971f8d413b2fba1fdd9267bc7eb3b318389f630",
          []
         ],
         "executor-worker.js": [
@@ -456949,10 +457576,6 @@
        "c894269593d2851041f63c8dfc4dcaf3e4b4e1c0",
        []
       ],
-      "refresh.99.html": [
-       "ca4e3462772b32b9de9875e581260117f929445b",
-       []
-      ],
       "refresh1.99.html": [
        "76121cfd4046e9d95726b4bd7ecc938599d43b88",
        []
@@ -456961,8 +457584,8 @@
        "14819dc3dbe742b5e7775f1abafb0f7c87226357",
        []
       ],
-      "refresh1dotdot5dot.html": [
-       "085b9e9ba71f0b0121b404f5bba1efb77e6abd03",
+      "refresh1dotdot9dot.html": [
+       "c8af3abbdfcb97446940c34fb74b7b113e8e2a70",
        []
       ]
      }
@@ -459530,25 +460153,11 @@
         "9695c9529424d612300127b3350254e15a05c27e",
         []
        ],
-       "reset-algorithm-rendering-ref.html": [
-        "acf192d1d55b7da110d04651093e3ebe0cd48214",
-        []
-       ],
-       "resources": {
-        "show-picker-child-iframe.html": [
-         "bba39898249d508b5e01741b3fb631a327d86858",
-         []
-        ]
-       },
-       "stylable-select": {
+       "customizable-select": {
         "appearance-base-select-other-elements-ref.html": [
          "72abb8843f6dab611347c60a5c3ab06860f3a33b",
          []
         ],
-        "border-rendering-ref.html": [
-         "61c68160585f80cc04569334421ee5f70ad5e7b8",
-         []
-        ],
         "closed-listbox-rendering-ref.html": [
          "d1a1f1bb61ff377679eac4c19efe0f8c4071a4ba",
          []
@@ -459557,6 +460166,16 @@
          "dccff7311d1c8c425ca4a199c5fb1e4ed6181a6e",
          []
         ]
+       },
+       "reset-algorithm-rendering-ref.html": [
+        "acf192d1d55b7da110d04651093e3ebe0cd48214",
+        []
+       ],
+       "resources": {
+        "show-picker-child-iframe.html": [
+         "bba39898249d508b5e01741b3fb631a327d86858",
+         []
+        ]
        }
       },
       "the-selectlist-element": {
@@ -463356,7 +463975,7 @@
          []
         ],
         "event-handler-body.js": [
-         "d7889e230e3ba3478282c1bdac4ce769294d18f1",
+         "38aede1ce474f1239754e8a3a4c0269171c7c2ac",
          []
         ],
         "open-window.html": [
@@ -465216,7 +465835,7 @@
      []
     ],
     "digital-credentials.idl": [
-     "a12ce5a2ba2253fb9011f51c41c0c14caf8d40c3",
+     "2207b25dd57a0b4d47552faaf0de5cc3cd892021",
      []
     ],
     "digital-goods.idl": [
@@ -465479,6 +466098,10 @@
      "a9dcf74e17cdf38d3d3cea8c7323c510d07653a1",
      []
     ],
+    "mediaqueries-5.idl": [
+     "52154c96725bd4c0b022e41f23232c3a798a4d6d",
+     []
+    ],
     "mediasession.idl": [
      "00bfe6ad21649d719511537db4f4ee046f8086b1",
      []
@@ -465860,7 +466483,7 @@
      []
     ],
     "webauthn.idl": [
-     "b4c0c2de603389016df1ad05ff6d58a50ae02aaa",
+     "2b855144650c7bd42346cca29d6e5a1d2d6e0750",
      []
     ],
     "webcodecs-aac-codec-registration.idl": [
@@ -465916,7 +466539,7 @@
      []
     ],
     "webhid.idl": [
-     "03e72511d961678fe82fee2a70afd44316b51835",
+     "56e3161caed3274adb28f8e56f9a499c6f38fe73",
      []
     ],
     "webidl.idl": [
@@ -465928,7 +466551,7 @@
      []
     ],
     "webnn.idl": [
-     "f8db7b0d5422e8c2cb3bfff8ba8cba54e4234365",
+     "9a71f73954cd1dc99e157c7d60571632959dbf2f",
      []
     ],
     "webrtc-encoded-transform.idl": [
@@ -465964,7 +466587,7 @@
      []
     ],
     "webtransport.idl": [
-     "2136cad41e3fc001a082bfd63f263522f099396b",
+     "6e9d10367369662f07051f64e02097678aa301f3",
      []
     ],
     "webusb.idl": [
@@ -469120,6 +469743,34 @@
      []
     ]
    },
+   "nav-tracking-mitigations": {
+    "META.yml": [
+     "00a8c7b72a17b91a7438358ff7d311516544d36f",
+     []
+    ],
+    "resources": {
+     "cross-origin-client-redirect-with-cookie-header.sub.https.html": [
+      "7676378a23fb1b2ca6540913ea1cb88654046ca9",
+      []
+     ],
+     "cross-origin-client-redirect-with-cookie-header.sub.https.html.headers": [
+      "64415c3575b8916c1da2b1ef595e99070e7834b1",
+      []
+     ],
+     "cross-origin-get-cookie.sub.https.html": [
+      "50277cb28a11ca04f6b90faa416ccbc2c236dc14",
+      []
+     ],
+     "redirect-chain-end.sub.https.html": [
+      "54966d6efd425334d8d0c9ef96186af87747a418",
+      []
+     ],
+     "redirect-chain-start.sub.https.html": [
+      "a1655f4483ea4c79403c704bef4624d60fb7450e",
+      []
+     ]
+    }
+   },
    "navigation-api": {
     "META.yml": [
      "de4f6c9a335bd4b7d5e99d14d37b904fe5d54182",
@@ -469466,6 +470117,18 @@
      []
     ],
     "resources": {
+     "cross-origin-nested-child.sub.html": [
+      "bc2fffc753d1c87c08dcf986a51c732e2380c0da",
+      []
+     ],
+     "cross-origin-nested-parent.sub.html": [
+      "0feb74892d2b180d4f6807f06cde7b9de018eb94",
+      []
+     ],
+     "cross-origin-serviceworker-iframe.sub.html": [
+      "5da8ab9f587a640a8d587a019b2c3f476b214132",
+      []
+     ],
      "custom-data.js": [
       "49a5c60d811338cc898bc64b1cbe8b3e41c54ca8",
       []
@@ -469478,6 +470141,18 @@
       "ee919cd512d8ae540d77161e7af1797f684fe014",
       []
      ],
+     "permission-helper.js": [
+      "22b11abae5217d9aeac345be97b1d0815aaf5474",
+      []
+     ],
+     "permission-sw.js": [
+      "5f231e46d0157b7ed4b3153aff195d857ece1ff8",
+      []
+     ],
+     "permission-worker.js": [
+      "17314bd5e1e53bf11e4c428e61111f03cad4a1e7",
+      []
+     ],
      "shownotification-sw.js": [
       "63a1569460d302bd72011675d4dabed7013b49d0",
       []
@@ -469680,12 +470355,16 @@
       "f024338bf7148e0908c707c006daa961485d7346",
       []
      ],
+     "partitioned-popins.close.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "partitioned-popins.cookies-iframe.html": [
       "04d95e6c6e92e37f60c7c7396501da133fd4f2a4",
       []
      ],
      "partitioned-popins.cookies-popin.py": [
-      "f5d94c3c5f1bf4e43436b7ccd82bd2ccc2097001",
+      "74024dd2f002b122bbd6363af2e52fbea184068e",
       []
      ],
      "partitioned-popins.cookies-window.html": [
@@ -469700,6 +470379,10 @@
       "4ab2d4a5ff22664e9c24bb094410eb92b9dc3684",
       []
      ],
+     "partitioned-popins.localStorage-popin.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "partitioned-popins.localStorage-window.html": [
       "1e1f4ed2a6b288e490ea786d8abc40c7b7b684a8",
       []
@@ -469712,20 +470395,32 @@
       "1009ee687a29a94a264aaf89c50fc64010d161a7",
       []
      ],
+     "partitioned-popins.permissions-popin.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "partitioned-popins.proxy-popin.html": [
       "d1b7b869338af2fc46ec7a666c230a155e9ca3ef",
       []
      ],
+     "partitioned-popins.proxy-popin.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "partitioned-popins.recursive.html": [
       "a4bceecf3951d23df6dc99b4807f9ece4666281a",
       []
      ],
+     "partitioned-popins.recursive.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "partitioned-popins.request-header.fetch.py": [
       "cf99c1ce62f6e51a4727ef122558d44da5ebe6a7",
       []
      ],
      "partitioned-popins.request-header.http.py": [
-      "440d9da94dde94a25af7e2011f93b1cbd537870b",
+      "60a0fc2a28a438f1f15251f210b21b70c15ed1e4",
       []
      ],
      "partitioned-popins.request-header.iframe.py": [
@@ -469733,25 +470428,37 @@
       []
      ],
      "partitioned-popins.request-header.initial.py": [
-      "59e7e947876c8112791f3af87c356aa91e08fa03",
+      "f182ae3dee18a06b110ec4baf69a8c443a7d6a8b",
       []
      ],
      "partitioned-popins.request-header.js.py": [
-      "603891733fde7fea36c477fd66aef034477cde26",
+      "7878693b220af9f224b4a65211fe5aad340ce369",
       []
      ],
      "partitioned-popins.wait.html": [
       "5a3630a5d5fff736580af1989959f3bacd3e02da",
       []
      ],
+     "partitioned-popins.wait.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "popinContextType.html": [
       "f1824001b068bc6595b3c2bfceea93d86cf3a96f",
       []
      ],
+     "popinContextType.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "popinContextTypesSupported.html": [
       "6ae9d689a6546dadf25ff65f4db79afa142df60e",
       []
      ],
+     "popinContextTypesSupported.html.headers": [
+      "783b6856418d29a29f6bfc0dd2d55438bc704c17",
+      []
+     ],
      "proxy-helpers.js": [
       "46359df0dc76016134dbf51d41d1ea000a0257a9",
       []
@@ -470303,7 +471010,7 @@
       []
      ],
      "digital-credentials-get.html": [
-      "04f256c2447c678879866da5aebd08d855474e87",
+      "489e42913592ae72641b6f4d55eb6d308b8e79ca",
       []
      ],
      "nested-sandbox.html": [
@@ -470362,6 +471069,18 @@
       "e32dde3845b415643f3cdd5cc193bbf5e6a02d67",
       []
      ],
+     "permissions-policy-hid-worker.html": [
+      "9a0c1f94f8e8bcf2cfa3ef27b59ec236b6927350",
+      []
+     ],
+     "permissions-policy-hid-worker.js": [
+      "d7490b2be717428e932133ada82a77b1f3f890fd",
+      []
+     ],
+     "permissions-policy-hid.html": [
+      "0b54d57cfa0a43520735d6289d6d3de659d7794c",
+      []
+     ],
      "permissions-policy-idle-detection-worker.html": [
       "5bcc3980390bbb4cc223998d0af5118d943a69f8",
       []
@@ -470745,7 +471464,7 @@
       []
      ],
      "cicp-display-p3.png": [
-      "8fa0ce2123c4f876a71b1ca80e04931614f3b87f",
+      "dc5277bedd4c5a9789126e064bc95541d7972b9f",
       []
      ],
      "exif-orientation-bottom-right.png": [
@@ -472698,7 +473417,7 @@
    },
    "remote-playback": {
     "META.yml": [
-     "a234398b8b891a14ce989de3317dd4190ae42cdf",
+     "e1caed7d74cca4fe7182cfa3b0e88097b7fc6674",
      []
     ],
     "README.md": [
@@ -473962,7 +474681,7 @@
      []
     ],
     "testdriver-actions.js": [
-     "3e5ba74b4cab356e56c73a4662e8f4b91dddf6de",
+     "edb4759954d4c3829ddc0aa2ecac84ef7d241e37",
      []
     ],
     "testdriver-vendor.js": [
@@ -473974,7 +474693,7 @@
      []
     ],
     "testdriver.js": [
-     "e737a6ee659f0502fbf4137094d237b08ca54fb8",
+     "d05be1d7df9a6a861a682f66bf532090c6c1877f",
      []
     ],
     "testdriver.js.headers": [
@@ -480437,7 +481156,7 @@
       ],
       "tasks": {
        "test.yml": [
-        "fffb146dacc792d9ac9da2caf557cb8ec3ebdec4",
+        "ee6f0fa9aebf37e881a38aa8e062e55e63825952",
         []
        ]
       },
@@ -480473,7 +481192,7 @@
         []
        ],
        "test_valid.py": [
-        "dd8d732654252a190dee1f0e8f9e056ec62f76cd",
+        "04c58f86c5930473af16ed03e34a009ccc0a9a7a",
         []
        ]
       }
@@ -491355,7 +492074,7 @@
         []
        ],
        "transport.py": [
-        "14b990f971d235db7a354677a7b9032dd2ff88a5",
+        "841b9d0933d1388e57ffee4ce2a19895f4fe8efa",
         []
        ],
        "undefined.py": [
@@ -491364,7 +492083,7 @@
        ]
       },
       "client.py": [
-       "e41df7f57640a6e40963de638872c130eae5d71d",
+       "97b29c64bcd6e3868b6554570a4505606c5c3413",
        []
       ],
       "error.py": [
@@ -491751,7 +492470,7 @@
         []
        ],
        "webkitgtk_minibrowser.py": [
-        "29a95638877034a343ed6bf0af032e4c088fa73f",
+        "cc25fff85647fb1b5e2d47c861c5fed786af065b",
         []
        ],
        "wktr.py": [
@@ -491773,7 +492492,7 @@
         []
        ],
        "actions.py": [
-        "4bf8d735a1ded0f07400c0d6b18857d83e7b67db",
+        "859ce8f4fa604481a029b0af624d4cddaeafd429",
         []
        ],
        "asyncactions.py": [
@@ -491785,7 +492504,7 @@
         []
        ],
        "executorchrome.py": [
-        "17ee492057ea4aec1b78830026fc821b40327b9b",
+        "4dd2f86f5cfd0de3da2bcd58f6fb40840ca7a417",
         []
        ],
        "executoredge.py": [
@@ -491793,7 +492512,7 @@
         []
        ],
        "executormarionette.py": [
-        "fe1fed136309ba137b705dc68917864f9bf878a2",
+        "23c6cf23023c14ac0b40d52bc667dd422e3f94bd",
         []
        ],
        "executorselenium.py": [
@@ -491809,7 +492528,7 @@
         []
        ],
        "executorwebdriver.py": [
-        "8a7adc5921e92507d121c9ebdaaab4bab8141f2c",
+        "3c1bdfd7a726e7359a9050ad840240c61a980fdf",
         []
        ],
        "executorwktr.py": [
@@ -491821,7 +492540,7 @@
         []
        ],
        "protocol.py": [
-        "eb97a805415b21e7aec1f0a4573d694690b13af3",
+        "f25694426ec81fa42622ab03b801f41843963666",
         []
        ],
        "pytestrunner": {
@@ -491936,7 +492655,7 @@
        []
       ],
       "testdriver-extra.js": [
-       "f7b9ae5fdbfc27c42b1f56ab1327bdcbc6cf8664",
+       "80abe67b0216cd88040ff41acea8f2bb9f9c7ca0",
        []
       ],
       "testdriver-vendor.js": [
@@ -491964,11 +492683,11 @@
        []
       ],
       "testloader.py": [
-       "65f6b2b673a492ca1cd341190deb69dd843b8902",
+       "5969f4ed60ede433eccda4cd52cdc01a1a8db83a",
        []
       ],
       "testrunner.py": [
-       "0d982f85772fcfc5f59e5bf4c804b80afc52570e",
+       "e84f5df1992d2164f6a676a0b28c436371768abe",
        []
       ],
       "tests": {
@@ -492082,7 +492801,7 @@
        []
       ],
       "wptcommandline.py": [
-       "3d1a6cf60af6cb31be1b76b8f93385e09dd6028d",
+       "e45ed0807f6af2abd2f91c5dea0d7a45de71a425",
        []
       ],
       "wptlogging.py": [
@@ -495052,7 +495771,7 @@
      []
     ],
     "README.md": [
-     "39b829b158f4782440789ef0ca89781113c838f7",
+     "e6cae317d0b480452038290f7e2f9acc5c377be2",
      []
     ],
     "WEB_FEATURES.yml": [
@@ -495211,6 +495930,10 @@
      "80f9c8c91f434b3977799451fbf2e37fb3cdbcad",
      []
     ],
+    "sfx.flac": [
+     "a8d313c562573d66a0e072aae4c70ba11480908c",
+     []
+    ],
     "sfx.mp3": [
      "d2600174469a203b229444919378c138b3cf6680",
      []
@@ -495276,7 +495999,7 @@
        []
       ],
       "__init__.py": [
-       "c42b5f3e501202b12c244d4db3a7010fbb9f1f55",
+       "ba982d1dc64ef5287d0e2e0c9a5d71a1b5cbc040",
        []
       ],
       "browser": {
@@ -495541,7 +496264,7 @@
       },
       "network": {
        "__init__.py": [
-        "41ddbbbff09913e07b9bb75b3fcddde26d55a3f3",
+        "95697d4dff726249ad2180264b1f3bb554e1725a",
         []
        ],
        "add_intercept": {
@@ -496439,10 +497162,22 @@
      "7453658f782db1f9cd9d2ada6956bbf0dc3ce821",
      []
     ],
+    "hid-allowed-by-permissions-policy.https.sub.html.headers": [
+     "e3650072dd2c2b52f0c5183f7bfab0548552583a",
+     []
+    ],
     "resources": {
      "common.js": [
       "1d0904af837814ad0bd19a79a08a88faaa616164",
       []
+     ],
+     "hid-allowed-by-permissions-policy-worker.js": [
+      "20cdb5d85a864943b19e9b134501a5ef040d5e27",
+      []
+     ],
+     "hid-disabled-by-permissions-policy-worker.js": [
+      "108a09d538bf2d52073ac7e1bc11f1c35f2785db",
+      []
      ]
     }
    },
@@ -496623,11 +497358,11 @@
     ],
     "resources": {
      "utils.js": [
-      "c6b6010b3b0c2ea60bb2394b42273427109d9a20",
+      "460fe46115476b073c5e650e119a6f6dd263b9ee",
       []
      ],
      "utils_validation.js": [
-      "856eea6cb3fc16f1e9316e795d4ad8485d2871b3",
+      "f491801bf3a6c04385ff49c2bf8b54cb5e355113",
       []
      ]
     }
@@ -496756,7 +497491,11 @@
       "f26cfcc1421bf8f9eceeb9f7c1746ff26fb7932e",
       []
      ]
-    }
+    },
+    "transfer-datachannel-worker.js": [
+     "10d71f68f022f2c79d3120c07e4da8a76579bcf0",
+     []
+    ]
    },
    "webrtc-encoded-transform": {
     "META.yml": [
@@ -496860,10 +497599,6 @@
     "transfer-datachannel-service-worker.js": [
      "c1919d0b9a7b1c1ef991cfd6018a8268e271eb1a",
      []
-    ],
-    "transfer-datachannel-worker.js": [
-     "10d71f68f022f2c79d3120c07e4da8a76579bcf0",
-     []
     ]
    },
    "webrtc-ice": {
@@ -501410,7 +502145,7 @@
     ],
     "BlobURL": {
      "cross-partition-navigation.tentative.https.html": [
-      "cdfa145a838c1529adc8a557e0cb84f54cd99ccf",
+      "80d3f6818b4d8286285589addc6baadd2331ed0b",
       [
        null,
        {
@@ -508314,15 +509049,15 @@
      ]
     ],
     "derive_bits_keys": {
-     "cfrg_curves_bits.https.any.js": [
-      "c1837591ee85d40d7ccf98b6ef56285369f0d7fd",
+     "cfrg_curves_bits_curve25519.https.any.js": [
+      "866192e0193bc18953c224647ac51f2bb373746f",
       [
-       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.html",
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.html",
        {
         "script_metadata": [
          [
           "title",
-          "WebCryptoAPI: deriveBits() Using ECDH with CFRG Elliptic Curves"
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
          ],
          [
           "script",
@@ -508336,12 +509071,12 @@
        }
       ],
       [
-       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.worker.html",
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.worker.html",
        {
         "script_metadata": [
          [
           "title",
-          "WebCryptoAPI: deriveBits() Using ECDH with CFRG Elliptic Curves"
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
          ],
          [
           "script",
@@ -508355,10 +509090,51 @@
        }
       ]
      ],
-     "cfrg_curves_keys.https.any.js": [
-      "96658a56e81da986a50863124109d71b91d9c571",
+     "cfrg_curves_bits_curve448.https.any.js": [
+      "32485c68107e5c0aa94264caf1a097909723d173",
       [
-       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.html",
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits_fixtures.js"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits_fixtures.js"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "cfrg_curves_keys_curve25519.https.any.js": [
+      "91390ba5c2a17a3ecd523b132153d5d965e543aa",
+      [
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.html",
        {
         "script_metadata": [
          [
@@ -508377,7 +509153,48 @@
        }
       ],
       [
-       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.worker.html",
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits_fixtures.js"
+         ],
+         [
+          "script",
+          "cfrg_curves_keys.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "cfrg_curves_keys_curve448.https.any.js": [
+      "b34e366376a70f6bf7628d9fa62c42e5201a053f",
+      [
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves"
+         ],
+         [
+          "script",
+          "cfrg_curves_bits_fixtures.js"
+         ],
+         [
+          "script",
+          "cfrg_curves_keys.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -515493,10 +516310,10 @@
        }
       ]
      ],
-     "okp_importKey.https.any.js": [
-      "a56bd31cbe14b1e5a2024a75fa77491bed2256ea",
+     "okp_importKey_Ed25519.https.any.js": [
+      "49656489d425dd4c54ec854756edfc6dacdf4765",
       [
-       "WebCryptoAPI/import_export/okp_importKey.https.any.html",
+       "WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.html",
        {
         "script_metadata": [
          [
@@ -515510,13 +516327,21 @@
          [
           "script",
           "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
          ]
         ],
         "timeout": "long"
        }
       ],
       [
-       "WebCryptoAPI/import_export/okp_importKey.https.any.worker.html",
+       "WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -515530,6 +516355,191 @@
          [
           "script",
           "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "okp_importKey_Ed448.https.any.js": [
+      "5bb7460c1fbc9333435925790cf8eacad7648611",
+      [
+       "WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "okp_importKey_X25519.https.any.js": [
+      "de1431d6cc24675e6ac7864c1e93d36b70a79765",
+      [
+       "WebCryptoAPI/import_export/okp_importKey_X25519.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "WebCryptoAPI/import_export/okp_importKey_X25519.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "okp_importKey_X448.https.any.js": [
+      "f8552be3c826dcf1f3511a5ad8cba295c62c1923",
+      [
+       "WebCryptoAPI/import_export/okp_importKey_X448.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "WebCryptoAPI/import_export/okp_importKey_X448.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: importKey() for OKP keys"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "../util/helpers.js"
+         ],
+         [
+          "script",
+          "okp_importKey_fixtures.js"
+         ],
+         [
+          "script",
+          "okp_importKey.js"
          ]
         ],
         "timeout": "long"
@@ -515899,10 +516909,10 @@
        }
       ]
      ],
-     "eddsa.https.any.js": [
-      "85993a48b91a8cb9ecf55f1db24b4ff39937d7b9",
+     "eddsa_curve25519.https.any.js": [
+      "3be9eef41a9a0f390d06a60485f9364dbceb7a9a",
       [
-       "WebCryptoAPI/sign_verify/eddsa.https.any.html",
+       "WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.html",
        {
         "script_metadata": [
          [
@@ -515926,7 +516936,58 @@
        }
       ],
       [
-       "WebCryptoAPI/sign_verify/eddsa.https.any.worker.html",
+       "WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: sign() and verify() Using EdDSA"
+         ],
+         [
+          "script",
+          "eddsa_vectors.js"
+         ],
+         [
+          "script",
+          "eddsa.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "eddsa_curve448.https.any.js": [
+      "6960c296bae6afd67878cbac0bec69dc7de77c71",
+      [
+       "WebCryptoAPI/sign_verify/eddsa_curve448.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "WebCryptoAPI: sign() and verify() Using EdDSA"
+         ],
+         [
+          "script",
+          "eddsa_vectors.js"
+         ],
+         [
+          "script",
+          "eddsa.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "WebCryptoAPI/sign_verify/eddsa_curve448.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -527695,10 +528756,10 @@
     ]
    },
    "compute-pressure": {
-    "compute_pressure_basic.https.any.js": [
-     "15d572bd8eed7dd7a88f4064433b7ac85176fba2",
+    "compute_pressure_basic.https.window.js": [
+     "ff50ef4e5613a7154d601699da7b3387a26256fe",
      [
-      "compute-pressure/compute_pressure_basic.https.any.html",
+      "compute-pressure/compute_pressure_basic.https.window.html?globalScope=dedicated_worker",
       {
        "script_metadata": [
         [
@@ -527706,23 +528767,39 @@
          "long"
         ],
         [
-         "script",
-         "/resources/test-only-api.js"
+         "variant",
+         "?globalScope=window"
+        ],
+        [
+         "variant",
+         "?globalScope=dedicated_worker"
         ],
         [
          "script",
-         "resources/pressure-helpers.js"
+         "/resources/testdriver.js"
         ],
         [
-         "global",
-         "window,dedicatedworker,sharedworker"
+         "script",
+         "/resources/testdriver-vendor.js"
+        ],
+        [
+         "script",
+         "/common/utils.js"
+        ],
+        [
+         "script",
+         "/common/dispatcher/dispatcher.js"
+        ],
+        [
+         "script",
+         "./resources/common.js"
         ]
        ],
        "timeout": "long"
       }
      ],
      [
-      "compute-pressure/compute_pressure_basic.https.any.sharedworker.html",
+      "compute-pressure/compute_pressure_basic.https.window.html?globalScope=window",
       {
        "script_metadata": [
         [
@@ -527730,40 +528807,32 @@
          "long"
         ],
         [
-         "script",
-         "/resources/test-only-api.js"
+         "variant",
+         "?globalScope=window"
+        ],
+        [
+         "variant",
+         "?globalScope=dedicated_worker"
         ],
         [
          "script",
-         "resources/pressure-helpers.js"
-        ],
-        [
-         "global",
-         "window,dedicatedworker,sharedworker"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "compute-pressure/compute_pressure_basic.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "timeout",
-         "long"
+         "/resources/testdriver.js"
         ],
         [
          "script",
-         "/resources/test-only-api.js"
+         "/resources/testdriver-vendor.js"
         ],
         [
          "script",
-         "resources/pressure-helpers.js"
+         "/common/utils.js"
         ],
         [
-         "global",
-         "window,dedicatedworker,sharedworker"
+         "script",
+         "/common/dispatcher/dispatcher.js"
+        ],
+        [
+         "script",
+         "./resources/common.js"
         ]
        ],
        "timeout": "long"
@@ -533036,7 +534105,7 @@
       ]
      ],
      "to-javascript-parent-initiated-parent-csp.html": [
-      "8aa8884914d58185bc5622dc0f3047030f873e1c",
+      "98052c42c1e8f0fdf038791ab685cfc1d4246385",
       [
        null,
        {}
@@ -536771,6 +537840,15 @@
      ]
     },
     "partitioned-cookies": {
+     "partitioned-cookies-a-b-a-embed.tentative.https.html": [
+      "512c17f5fb7dee6e8fc5b09a213c875b59b3a210",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "partitioned-cookies-cross-site-subresource-to-same-site-redirect.tentative.https.html": [
       "3a0afcec692f35d7b61ea88089e6ac7550af0dd4",
       [
@@ -544318,8 +545396,8 @@
        {}
       ]
      ],
-     "scope-shadow.tentative.html": [
-      "83a468bd07b535a3a35d08723d3fcda864fb5fca",
+     "scope-shadow.html": [
+      "6aa1f3fce80cd48c33514a74146affb3c9b12e95",
       [
        null,
        {}
@@ -544639,7 +545717,7 @@
        ]
       ],
       "color-valid-relative-color.html": [
-       "f7ee41410ea91eda290bd6ede019695de38d73c4",
+       "2c4dc0f8e60bf0df1668f9f840b379fda18bd786",
        [
         null,
         {}
@@ -544695,6 +545773,13 @@
        ]
       ]
      },
+     "relative-currentcolor-visited-getcomputedstyle.html": [
+      "443af36888a7091318dbc63b470feed4a5c50a94",
+      [
+       null,
+       {}
+      ]
+     ],
      "system-color-compute.html": [
       "ed4f3b947e81b91e0a63a5f8be619586be89e73c",
       [
@@ -544855,8 +545940,22 @@
         {}
        ]
       ],
+      "at-container-overflowing-parsing.html": [
+       "5c15a825853f7e545d43fe6f2c73cb0cc4bc45b4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "at-container-overflowing-serialization.html": [
+       "f55cfeb63433cda37e1dd3393fc990107679b522",
+       [
+        null,
+        {}
+       ]
+      ],
       "at-container-parsing.html": [
-       "b8872e89a45d28ce5313fea06b594ca9ac4df4c0",
+       "5c9d8c1bb9ea63a34016ca1a4b9931186a9c2209",
        [
         null,
         {}
@@ -544870,7 +545969,7 @@
        ]
       ],
       "at-container-snapped-parsing.html": [
-       "490c416a1ed8dcb317f683939adc37c26e5201b3",
+       "0a8fe50bc38e7bb297cb2f0e9092680918599472",
        [
         null,
         {}
@@ -544884,7 +545983,7 @@
        ]
       ],
       "at-container-stuck-parsing.html": [
-       "e2d305cbb826cfc13fc95651e7741c0584b41c76",
+       "a3a1f01458d1ce321b21089ba3f65ffa12ee34d4",
        [
         null,
         {}
@@ -544898,7 +545997,7 @@
        ]
       ],
       "at-container-style-parsing.html": [
-       "3ee22be9f5bca2acce53a68a217c7a958c3a48d8",
+       "c63cc76560b4680d5a33863bda747c9fdde9cada",
        [
         null,
         {}
@@ -545576,6 +546675,13 @@
         {}
        ]
       ],
+      "scroll-state-snapped-none.html": [
+       "8c7aae56bebf34adb9214a36b3779ff45d085dcd",
+       [
+        null,
+        {}
+       ]
+      ],
       "scroll-state-snapped-snap-changing.html": [
        "161c2e1368dd2ba88442c367cd1f1a06ac9b8b3f",
        [
@@ -548914,6 +550020,13 @@
        {}
       ]
      ],
+     "negative-overflow-003.html": [
+      "e30c3ff0380dd5fb54dba3f59a64854d97e3f1fd",
+      [
+       null,
+       {}
+      ]
+     ],
      "negative-overflow.html": [
       "52fa9b97b66acf4673eb6da1d334ba9e0b1e17bc",
       [
@@ -556966,7 +558079,7 @@
       ]
      ],
      "nested-declarations-cssom.html": [
-      "bfd56860ef422d020915897399cb60729a497c06",
+      "ee8ba2295230ca485424dff6d47305c3d1266c36",
       [
        null,
        {}
@@ -561684,6 +562797,13 @@
        {}
       ]
      ],
+     "host-part-002.html": [
+      "d508cd9002412b9cc39fce7eeec51c35e1a2d91c",
+      [
+       null,
+       {}
+      ]
+     ],
      "host-stylesheet.html": [
       "2e65c4b1b57bd9959c68e85e11b442c67f2c5a42",
       [
@@ -561777,6 +562897,13 @@
        {}
       ]
      ],
+     "multiple-scopes.html": [
+      "2d92126baa3c0eea7e53ff3cbe3f8bb307e608b8",
+      [
+       null,
+       {}
+      ]
+     ],
      "part-mutation-pseudo.html": [
       "d0e0072d51e6521ab6b4daba9dfe0ce674970297",
       [
@@ -567275,7 +568402,7 @@
       ]
      },
      "inheritance.html": [
-      "ff4676fb9398e0f0159d0b93575631fcca81244c",
+      "89b1829e95580f4fe084a8d6c1efe6315ca52130",
       [
        null,
        {}
@@ -567402,7 +568529,21 @@
        ]
       ],
       "text-emphasis-position-computed.html": [
-       "5898d70fbf385b95770cf25ade39ec3c28481202",
+       "31cb8703b9fe57ba81759059aeaa8394bd8cc2c5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-emphasis-position-invalid.html": [
+       "1b7d2ca406e5f8e684853deb88e84261e2eb0489",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-emphasis-position-valid.html": [
+       "81f6f0f8208b87494dca07cd2325ac51d342f632",
        [
         null,
         {}
@@ -572270,7 +573411,7 @@
       ]
      ],
      "calc-invalid-parsing.html": [
-      "937b8147c6fa682c6b93aeaf7dadc5dbdda4f03f",
+      "0b268f102b3fcb8aa0534fe1650160f3802f5b91",
       [
        null,
        {}
@@ -573868,6 +575009,15 @@
        ]
       ]
      },
+     "nested": {
+      "opacity-computed-style.tentative.html": [
+       "f370b7b03d268f9abdaa0e3782e2ef41d4a17f00",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "no-crash-set-exception.html": [
       "bc0d764a590aaed95d2e6afe487f2477385a9c94",
       [
@@ -574210,6 +575360,13 @@
         {}
        ]
       ],
+      "widget.html": [
+       "cd7a5446693721908018a699c43b4687f130f2eb",
+       [
+        null,
+        {}
+       ]
+      ],
       "zoom-with-sign-function.html": [
        "d3df186199bc8b4e28f7becdad555210d063a225",
        [
@@ -581279,8 +582436,17 @@
       {}
      ]
     ],
+    "create.tentative.https.html": [
+     "299a240ced17f11c8d5249d65b54e873fe3362b3",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "default-permissions-policy.https.sub.html": [
-     "1d46c53736073368534d87db53019ffa7ff664fd",
+     "742a94ec4eb8ff079b1b24f17179962818fb3868",
      [
       null,
       {
@@ -581296,7 +582462,7 @@
      ]
     ],
     "disabled-by-permissions-policy.https.sub.html": [
-     "d3c6b91f2600753473e14ccd2d7c840bc1fe684e",
+     "616a3beb0b3cd2a8345ca268adeddeb87a0919fe",
      [
       null,
       {
@@ -581305,7 +582471,7 @@
      ]
     ],
     "enabled-on-self-origin-by-permissions-policy.https.sub.html": [
-     "0fc765e4a82fa9c07e01226558f81e2aed8e3198",
+     "a59c5c72fa0efba26775461ab34562d17d138d7d",
      [
       null,
       {
@@ -581314,7 +582480,7 @@
      ]
     ],
     "get-user-activation.https.html": [
-     "d4af78a9362e5f7aa802c27c75a879e49899e546",
+     "fbf2099dad37443c4522e3a838ab962f2c260004",
      [
       null,
       {
@@ -581322,8 +582488,8 @@
       }
      ]
     ],
-    "identity-create.tentative.https.html": [
-     "027a796652e8664b1805085cc7aaefbcd3e8c241",
+    "get.tentative.https.html": [
+     "6de3ed8e90ab4d26190337c64c5d067ad78336a8",
      [
       null,
       {
@@ -581331,13 +582497,15 @@
       }
      ]
     ],
-    "identity-get.tentative.https.html": [
-     "527a69a60207b38a824d77d7a513ee92769036e5",
+    "historical.any.js": [
+     "97e1565fe9fbb17abcf1667006640bf1e247f9b8",
      [
-      null,
-      {
-       "testdriver": true
-      }
+      "digital-credentials/historical.any.html",
+      {}
+     ],
+     [
+      "digital-credentials/historical.any.worker.html",
+      {}
      ]
     ],
     "non-fully-active.https.html": [
@@ -581393,7 +582561,7 @@
      ]
     ],
     "display-mode.https.html": [
-     "4888535357683d637030712c53ef9050bbf8cd65",
+     "1b20a3593fb8131b8737734ef698375e5df604bc",
      [
       null,
       {
@@ -585531,7 +586699,7 @@
        ]
       ],
       "observable-from.any.js": [
-       "cc4d3119d2170cb083faa5cdd1c8fd1e70e8aca3",
+       "e924f1f5e84061ed34538ebd5d9cec8bd9ffe723",
        [
         "dom/observable/tentative/observable-from.any.html",
         {}
@@ -597577,7 +598745,7 @@
     "legacy-mb-schinese": {
      "gb18030": {
       "gb18030-decoder.any.js": [
-       "fca68358623bd9cc285457bc952ccb202896b7bb",
+       "aa226e185be7cad46ef21ed033bf373de2bf4b22",
        [
         "encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.html",
         {
@@ -597602,7 +598770,7 @@
        ]
       ],
       "gb18030-encoder.html": [
-       "531d26084e27dcd441537b02475d4d9460292988",
+       "dc0dc43468f248a7b3bd091c36ba230e826a501f",
        [
         null,
         {}
@@ -597611,7 +598779,7 @@
      },
      "gbk": {
       "gbk-decoder.any.js": [
-       "c0221480da156dde0068454edd635e92458da6cb",
+       "b7f1ca9c51e88f440661c9ec48b6c256c1cd7047",
        [
         "encoding/legacy-mb-schinese/gbk/gbk-decoder.any.html",
         {}
@@ -597622,7 +598790,7 @@
        ]
       ],
       "gbk-encoder.html": [
-       "e43cb73fea72e5446e2678d202b6050b56db706f",
+       "11557242e3dc658304243aa4a05880c41033655f",
        [
         null,
         {}
@@ -605440,6 +606608,15 @@
     }
    },
    "fedcm": {
+    "fedcm-abort-silent-mediation-not-permitted.https.html": [
+     "63c49c68ce4826a907885ae79a54661ffc1e004c",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fedcm-abort.https.html": [
      "0f03bff832f800c9ce69de69003c88bbbd471fca",
      [
@@ -613405,7 +614582,7 @@
        ]
       ],
       "request-constructor-init-body-override.any.js": [
-       "27bb991871a8a183436ab14613147aba6fc8c231",
+       "c2bbf86f304c2f55c9b9dbaf3cce28daadc59f30",
        [
         "fetch/api/request/request-constructor-init-body-override.any.html",
         {}
@@ -630345,7 +631522,7 @@
       ]
      ],
      "server-response.https.window.js": [
-      "3e1011d422926c4747540bc98a8179d61b2eba67",
+      "9c2096ee3d7259b76ed8aa98275b737d1a55a3e7",
       [
        "fledge/tentative/server-response.https.window.html?1-4",
        {
@@ -630389,6 +631566,798 @@
          [
           "variant",
           "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?13-16",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?17-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?21-24",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?25-28",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?29-32",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?33-36",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?37-40",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?41-44",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/server-response.https.window.html?45-48",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
          ]
         ],
         "timeout": "long"
@@ -630437,6 +632406,42 @@
          [
           "variant",
           "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
          ]
         ],
         "timeout": "long"
@@ -630485,6 +632490,42 @@
          [
           "variant",
           "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-40"
+         ],
+         [
+          "variant",
+          "?41-44"
+         ],
+         [
+          "variant",
+          "?45-48"
          ]
         ],
         "timeout": "long"
@@ -638626,7 +640667,7 @@
         ]
        ],
        "same-url.html": [
-        "bcca5ed90cbd7d181f4fc05a3427dd7749292fb3",
+        "ac0ef4d7aa0e13d12cc224c6e91fb578349ca51b",
         [
          null,
          {}
@@ -645119,6 +647160,13 @@
      }
     },
     "canvas": {
+     "color.window.js": [
+      "fafa19a4b02f1d61164773850ce4b153cb325b25",
+      [
+       "html/canvas/color.window.html",
+       {}
+      ]
+     ],
      "element": {
       "2d.conformance.requirements.basics.html": [
        "fed4aa61ba922171c3bd61a071b73ef2442c327d",
@@ -674865,7 +676913,7 @@
     },
     "meta": {
      "refresh-time.html": [
-      "7aef1266a2bdc3fdae0a83d814bd32a2f0e816cb",
+      "90e9375879e0f2e0c9fcdf1cee394d7a9fc12685",
       [
        null,
        {}
@@ -683714,6 +685762,118 @@
          {}
         ]
        ],
+       "customizable-select": {
+        "nested-options.tenative.html": [
+         "7e89a5ad428f69b04d21d1ba7dbd56a8d06ff988",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "option-computed-style.tentative.html": [
+         "14650f3f320ae6f1974558ef63f47298a67801b3",
+         [
+          null,
+          {}
+         ]
+        ],
+        "select-accessibility-minimum-target-size.tentative.html": [
+         "3155849a5863bf1fd205630317bc7319097c765d",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "select-datalist-options-idl.tentative.html": [
+         "e00fb1951d499a276f15f74c6bd288d79333fa7a",
+         [
+          null,
+          {}
+         ]
+        ],
+        "select-disabled.tentative.html": [
+         "60530b417d59bd0891f820e76b31d1992cbecc3d",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "select-fallback-datalist-animations.tentative.html": [
+         "907b668c3f2d70eff5e0337a1f76fcdbe970a9ed",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "select-keyboard-behavior.tentative.html": [
+         "c7894e63c6c5fcdd37e3fdcf879e0cbfcf67d2bb",
+         [
+          null,
+          {
+           "testdriver": true,
+           "timeout": "long"
+          }
+         ]
+        ],
+        "select-mouse-behavior.tentative.html": [
+         "b6463b57b750a216fc7e89b895d66c9fe80a602b",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "select-option-hover-styles.tentative.html": [
+         "42231b7900a9e46d76ecb3a67e3c6239305bc721",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "select-parsing.tentative.html": [
+         "5aa4638f0be81919e01d53ea4bae5b0c1ba60cc5",
+         [
+          null,
+          {}
+         ]
+        ],
+        "selectedoption.tentative.html": [
+         "b3381ac510a9905b0907e1528287197352bc4c86",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "selectedoptionelement-attr.tentative.html": [
+         "63b4af3abc8bf7b40c68295fe3d0ff6139c2229a",
+         [
+          null,
+          {}
+         ]
+        ],
+        "switch-picker-appearance.tentative.html": [
+         "7a58f62e2900f8ca6c7cb1438a4f303602e31f03",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ]
+       },
        "inserted-or-removed.html": [
         "0db2bf0e77a4a8a76ebcef1b0879cac9bb8c3fea",
         [
@@ -683868,128 +686028,7 @@
           "timeout": "long"
          }
         ]
-       ],
-       "stylable-select": {
-        "nested-options.tenative.html": [
-         "7e89a5ad428f69b04d21d1ba7dbd56a8d06ff988",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "option-computed-style.tentative.html": [
-         "14650f3f320ae6f1974558ef63f47298a67801b3",
-         [
-          null,
-          {}
-         ]
-        ],
-        "select-accessibility-minimum-target-size.tentative.html": [
-         "3155849a5863bf1fd205630317bc7319097c765d",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-datalist-options-idl.tentative.html": [
-         "e00fb1951d499a276f15f74c6bd288d79333fa7a",
-         [
-          null,
-          {}
-         ]
-        ],
-        "select-disabled.tentative.html": [
-         "60530b417d59bd0891f820e76b31d1992cbecc3d",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-fallback-datalist-animations.tentative.html": [
-         "907b668c3f2d70eff5e0337a1f76fcdbe970a9ed",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-keyboard-behavior.tentative.html": [
-         "c7894e63c6c5fcdd37e3fdcf879e0cbfcf67d2bb",
-         [
-          null,
-          {
-           "testdriver": true,
-           "timeout": "long"
-          }
-         ]
-        ],
-        "select-keyboard-hidden-option.tentative.html": [
-         "b9d7cfbd3c0fc0c8ab67e045e3fae896115bdc51",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-mouse-behavior.tentative.html": [
-         "b6463b57b750a216fc7e89b895d66c9fe80a602b",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-option-hover-styles.tentative.html": [
-         "42231b7900a9e46d76ecb3a67e3c6239305bc721",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "select-parsing.tentative.html": [
-         "5aa4638f0be81919e01d53ea4bae5b0c1ba60cc5",
-         [
-          null,
-          {}
-         ]
-        ],
-        "selectedoption.tentative.html": [
-         "b3381ac510a9905b0907e1528287197352bc4c86",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ],
-        "selectedoptionelement-attr.tentative.html": [
-         "63b4af3abc8bf7b40c68295fe3d0ff6139c2229a",
-         [
-          null,
-          {}
-         ]
-        ],
-        "switch-picker-appearance.tentative.html": [
-         "7a58f62e2900f8ca6c7cb1438a4f303602e31f03",
-         [
-          null,
-          {
-           "testdriver": true
-          }
-         ]
-        ]
-       }
+       ]
       },
       "the-selectlist-element": {
        "selectlist-ask-for-reset.html": [
@@ -694829,7 +696868,7 @@
         ]
        ],
        "event-handler-all-global-events.html": [
-        "ee8c34ced313f5406992a1f3dc02edeba41e4f0e",
+        "fb01cc8e6092d14360668893f402a7ac6963a78a",
         [
          null,
          {}
@@ -706025,7 +708064,7 @@
      ]
     ],
     "MediaStreamTrack-getSettings.https.html": [
-     "3bae50c346dd3c83d15f37eca598b58838250c46",
+     "7c583a568c9645e89cd0993aa483b0cdc90176a0",
      [
       null,
       {
@@ -707907,6 +709946,17 @@
      ]
     ]
    },
+   "nav-tracking-mitigations": {
+    "stateful-client-bounce.sub.https.html": [
+     "798d58fad6570a87237d42926747fe9a41d880d0",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ]
+   },
    "navigation-api": {
     "commit-behavior": {
      "after-transition-new-navigation-before-commit.html": [
@@ -711367,6 +713417,24 @@
       {}
      ]
     ],
+    "cross-origin-nested.tentative.https.sub.html": [
+     "5430bee051114de2773288cf6fdfc58ecea8cfe5",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "cross-origin-serviceworker.tentative.https.sub.html": [
+     "ee5ae67dee0c774467d5ba64060e61e36f0959f0",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "event-onclose.https.html": [
      "b410e6c9a1557a90e9d4c7d62c55af8cd6ec9a7b",
      [
@@ -711574,7 +713642,7 @@
      ]
     ],
     "permissions-non-secure.html": [
-     "0f4724c9b66e0501d968b3c463d1e81e6d3f393c",
+     "3a2930a45276b7ec1122907642d07882eef3f57c",
      [
       null,
       {}
@@ -718536,7 +720604,7 @@
    "presentation-api": {
     "controlling-ua": {
      "PresentationConnectionCloseEvent.https.html": [
-      "34c935a6039b5690c6aa368a2e1ed9c4f450494a",
+      "4a5c135d48ce1d3b3eac0da1fc33aa719a0fcdb7",
       [
        null,
        {}
@@ -736243,6 +738311,15 @@
       {}
      ]
     ],
+    "Selection-direction-on-clicks.tentative.html": [
+     "8bff6e9396a919ee9a3dd3059cb99d402de3b041",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "addRange-00.html": [
      "7f73f2a3a3a459758cae45a0d14024ba901bca9c",
      [
@@ -736819,6 +738896,15 @@
         {}
        ]
       ],
+      "Selection-direction.html": [
+       "340711a8f0682d2736fa355efadab337189a6feb",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "Selection-getComposedRanges-collapsed.html": [
        "99ab82eb39cf44ac19cc32b42bd50eb1eef1b93a",
        [
@@ -741582,6 +743668,15 @@
         }
        ]
       ],
+      "dom-mutation.html": [
+       "54479e00dca3ad7108460bc334ca4229d7bae36f",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "label-descendant.html": [
        "2b29efd648ab800b60cc1a9bd6ec2fb6f5500322",
        [
@@ -741636,15 +743731,6 @@
       {}
      ]
     ],
-    "selection-direction.tentative.html": [
-     "340711a8f0682d2736fa355efadab337189a6feb",
-     [
-      null,
-      {
-       "testdriver": true
-      }
-     ]
-    ],
     "shadow-root-clonable.html": [
      "a8d4a4ca5167549f89a1c154794befc5de706cd4",
      [
@@ -772706,6 +774792,15 @@
       }
      ]
     ],
+    "getclientcapabilities.https.html": [
+     "86938202198467f42faabe40293bd89607f5088d",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "getcredential-abort.https.html": [
      "958f65daf1bccfe6200bb4a06e9cd75e06f4346d",
      [
@@ -773134,7 +775229,7 @@
      ]
     ],
     "audio-decoder.https.any.js": [
-     "fd828d481571d80eff7ddd5cc389cf13ffc659dd",
+     "471e0e4ad02c0b01f79cd111c5f416e406d23756",
      [
       "webcodecs/audio-decoder.https.any.html",
       {
@@ -773236,7 +775331,7 @@
      ]
     ],
     "audioDecoder-codec-specific.https.any.js": [
-     "f032b0fe59a5e977fd9db8d958734e7a3481b2e7",
+     "6a4793c62c908f3d938f549dc0da5fd667d58cc0",
      [
       "webcodecs/audioDecoder-codec-specific.https.any.html?adts_aac",
       {
@@ -773292,6 +775387,73 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/audioDecoder-codec-specific.https.any.html?flac",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "variant",
+         "?adts_aac"
+        ],
+        [
+         "variant",
+         "?mp4_aac"
+        ],
+        [
+         "variant",
+         "?mp3"
+        ],
+        [
+         "variant",
+         "?opus"
+        ],
+        [
+         "variant",
+         "?pcm_alaw"
+        ],
+        [
+         "variant",
+         "?pcm_ulaw"
+        ],
+        [
+         "variant",
+         "?pcm_u8"
+        ],
+        [
+         "variant",
+         "?pcm_s16"
+        ],
+        [
+         "variant",
+         "?pcm_s24"
+        ],
+        [
+         "variant",
+         "?pcm_s32"
+        ],
+        [
+         "variant",
+         "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773351,6 +775513,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773410,6 +775576,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773469,6 +775639,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773528,6 +775702,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773587,6 +775765,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773646,6 +775828,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773705,6 +775891,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773764,6 +775954,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773823,6 +776017,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773882,6 +776080,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -773941,6 +776143,73 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/audioDecoder-codec-specific.https.any.worker.html?flac",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "variant",
+         "?adts_aac"
+        ],
+        [
+         "variant",
+         "?mp4_aac"
+        ],
+        [
+         "variant",
+         "?mp3"
+        ],
+        [
+         "variant",
+         "?opus"
+        ],
+        [
+         "variant",
+         "?pcm_alaw"
+        ],
+        [
+         "variant",
+         "?pcm_ulaw"
+        ],
+        [
+         "variant",
+         "?pcm_u8"
+        ],
+        [
+         "variant",
+         "?pcm_s16"
+        ],
+        [
+         "variant",
+         "?pcm_s24"
+        ],
+        [
+         "variant",
+         "?pcm_s32"
+        ],
+        [
+         "variant",
+         "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774000,6 +776269,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774059,6 +776332,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774118,6 +776395,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774177,6 +776458,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774236,6 +776521,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774295,6 +776584,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774354,6 +776647,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774413,6 +776710,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774472,6 +776773,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -774531,6 +776836,10 @@
         [
          "variant",
          "?pcm_f32"
+        ],
+        [
+         "variant",
+         "?flac"
         ]
        ]
       }
@@ -777286,7 +779595,7 @@
      ]
     ],
     "video-decoder.https.any.js": [
-     "5b3193b8c37a4558945e5e2ae29639c26980ef89",
+     "6b77aeae5451d7e745ef7ddc495864a50e763066",
      [
       "webcodecs/video-decoder.https.any.html",
       {
@@ -779150,10 +781459,46 @@
     ]
    },
    "webhid": {
-    "idlharness.https.window.js": [
-     "bdc8419ba8bf4c40ac62634b04ebd962d118c36b",
+    "hid-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html": [
+     "0a286acd3bef32ea0a7dc809c392adfe5200c948",
      [
-      "webhid/idlharness.https.window.html",
+      null,
+      {}
+     ]
+    ],
+    "hid-allowed-by-permissions-policy-attribute.https.sub.html": [
+     "f0963c4e401ec327ecf9a615442ca7d5c30faaa6",
+     [
+      null,
+      {}
+     ]
+    ],
+    "hid-allowed-by-permissions-policy.https.sub.html": [
+     "645989c3f2206a38fc80637aa19943ef5278cdda",
+     [
+      null,
+      {}
+     ]
+    ],
+    "idlharness.https.any.js": [
+     "c0ed06636652ca5d793295f77134f5f9f9f3f91c",
+     [
+      "webhid/idlharness.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webhid/idlharness.https.any.worker.html",
       {
        "script_metadata": [
         [
@@ -781138,7 +783483,7 @@
    "webnn": {
     "conformance_tests": {
      "abs.https.any.js": [
-      "ca9f3d3ca94fa02e51e58b0c9783ed63faf5d738",
+      "0f8a6cd33099b01176bc45b2e1532ef17a5a8361",
       [
        "webnn/conformance_tests/abs.https.any.html?cpu",
        {
@@ -781357,7 +783702,7 @@
       ]
      ],
      "add.https.any.js": [
-      "17c04d1d2c188d67d415f5347b839a866bf4d55f",
+      "c084dd009e230da10da59703461e091266cfbb42",
       [
        "webnn/conformance_tests/add.https.any.html?cpu",
        {
@@ -781576,7 +783921,7 @@
       ]
      ],
      "arg_min_max.https.any.js": [
-      "e730f5135e8a49d80324d24532ebcc862cd5ef62",
+      "a3711d3ab81e5c32a8f23b04c00afc9c3d9baf68",
       [
        "webnn/conformance_tests/arg_min_max.https.any.html?cpu",
        {
@@ -781795,7 +784140,7 @@
       ]
      ],
      "batch_normalization.https.any.js": [
-      "08dda14db28e781db2defc683b9fc86964d3f30a",
+      "55c8ddbe761da5a676e1a7a27629c878196eac55",
       [
        "webnn/conformance_tests/batch_normalization.https.any.html?cpu",
        {
@@ -782014,7 +784359,7 @@
       ]
      ],
      "byob_readtensor.https.any.js": [
-      "9a12bf02439919b994cba80929a220d353efaf43",
+      "b99c8704d236c0f18f006514eb65a64566a3369e",
       [
        "webnn/conformance_tests/byob_readtensor.https.any.html?cpu",
        {
@@ -782257,7 +784602,7 @@
       ]
      ],
      "cast.https.any.js": [
-      "a4223736f612173e8fe76635ece98011515123ef",
+      "b73cf3c41bb002745c8d22d5759ed6f3ce73dc61",
       [
        "webnn/conformance_tests/cast.https.any.html?cpu",
        {
@@ -782476,7 +784821,7 @@
       ]
      ],
      "ceil.https.any.js": [
-      "2e490bd1ecb07110b4160a69a44da1d1cdc1769f",
+      "93549ad3cfed8e7593aeb49afccb0cc528e05a57",
       [
        "webnn/conformance_tests/ceil.https.any.html?cpu",
        {
@@ -782695,7 +785040,7 @@
       ]
      ],
      "clamp.https.any.js": [
-      "115ddabc6d66d5161f547d16c94e54af5d32233d",
+      "083eca7128c6ce93bb30be8eafc43ee99a110c08",
       [
        "webnn/conformance_tests/clamp.https.any.html?cpu",
        {
@@ -782914,7 +785259,7 @@
       ]
      ],
      "compute-arraybufferview-with-bigger-arraybuffer.https.any.js": [
-      "e1e647ee50cf49049ff5901403a328cee2983950",
+      "c150992ca64f8e5896f79c9021cec1c148821743",
       [
        "webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.html?cpu",
        {
@@ -783103,7 +785448,7 @@
       ]
      ],
      "concat.https.any.js": [
-      "6beb089e84efd8fce9f7dc6eb4b2ca8afa25646b",
+      "bb6a92a93b6b1cfc644b7bdcdebd3622200f8ef3",
       [
        "webnn/conformance_tests/concat.https.any.html?cpu",
        {
@@ -783322,7 +785667,7 @@
       ]
      ],
      "conv2d.https.any.js": [
-      "b3354728634a9bf5848f75ce1d13abd0a3375453",
+      "3cb964bc3b77a02d8f1628267ba3f912b99ab164",
       [
        "webnn/conformance_tests/conv2d.https.any.html?cpu",
        {
@@ -783541,7 +785886,7 @@
       ]
      ],
      "conv_transpose2d.https.any.js": [
-      "a76f180b55667756bc09bb635488721b1c340e62",
+      "1833f5ce473c4702da57604c82ef3b0b2f6e73bb",
       [
        "webnn/conformance_tests/conv_transpose2d.https.any.html?cpu",
        {
@@ -783760,7 +786105,7 @@
       ]
      ],
      "cos.https.any.js": [
-      "5ad92e7014a8b826ddd7c622f1edb5d9a6a6fda0",
+      "4a50dff594b5f3f79205737d67db125cb92f86a9",
       [
        "webnn/conformance_tests/cos.https.any.html?cpu",
        {
@@ -783979,7 +786324,7 @@
       ]
      ],
      "dequantizeLinear.https.any.js": [
-      "2939121c24182e49cccfafa2df26ca2e56fa1356",
+      "c6acb042a2462605ae46b3e388a706081ff0670f",
       [
        "webnn/conformance_tests/dequantizeLinear.https.any.html?cpu",
        {
@@ -784198,7 +786543,7 @@
       ]
      ],
      "div.https.any.js": [
-      "69183ee1097b1aacd36f863383fc5b846741e0a4",
+      "2c36884ce91f9f3289cb1e1c975a6891bfab898b",
       [
        "webnn/conformance_tests/div.https.any.html?cpu",
        {
@@ -784417,7 +786762,7 @@
       ]
      ],
      "elu.https.any.js": [
-      "75b982944ba972cd01fd7fe606a4e062511ec524",
+      "ed4d0c42490215af8ed54a7a842b39d78a38ea35",
       [
        "webnn/conformance_tests/elu.https.any.html?cpu",
        {
@@ -784636,7 +786981,7 @@
       ]
      ],
      "equal.https.any.js": [
-      "c763786d4aff522f8be95750cd4f033490c1db90",
+      "37cd0ca97dc2062dccae90859e39911750dfc756",
       [
        "webnn/conformance_tests/equal.https.any.html?cpu",
        {
@@ -784855,7 +787200,7 @@
       ]
      ],
      "erf.https.any.js": [
-      "78fc81ea74a693f0ebe4a76bf186de007a427000",
+      "7e8a8e0c739cf630c9bfda2d15d2bda5df671ebe",
       [
        "webnn/conformance_tests/erf.https.any.html?cpu",
        {
@@ -785074,7 +787419,7 @@
       ]
      ],
      "exp.https.any.js": [
-      "9d67712ee60cdf14584ad8c66a9df02d62fee822",
+      "7b1dae9ac8b922619baa3fffc472bf32f72b899b",
       [
        "webnn/conformance_tests/exp.https.any.html?cpu",
        {
@@ -785293,7 +787638,7 @@
       ]
      ],
      "expand.https.any.js": [
-      "6f94795370fab10c825a74534ae2cbc3bf74eb15",
+      "6668a5cc216ebe7a7fd4dfc7e036893dab2a2623",
       [
        "webnn/conformance_tests/expand.https.any.html?cpu",
        {
@@ -785512,7 +787857,7 @@
       ]
      ],
      "floor.https.any.js": [
-      "4cca407cd4c3df4bba1e94a68ca2adbd97d26927",
+      "e59f220f4eb3cabbe6438c0997331f04eed80624",
       [
        "webnn/conformance_tests/floor.https.any.html?cpu",
        {
@@ -785731,7 +788076,7 @@
       ]
      ],
      "gather.https.any.js": [
-      "3befa3818fcef7abd4aaeb9d28bae84f53546940",
+      "3cdd411ecb3fada629dd458cf51e5916bf1b322c",
       [
        "webnn/conformance_tests/gather.https.any.html?cpu",
        {
@@ -785950,7 +788295,7 @@
       ]
      ],
      "gatherElements.https.any.js": [
-      "6545375bf2be1ef3dd437d44abc939cce8427573",
+      "ed08346e392ca304c406256fe8c60e12bfbefc30",
       [
        "webnn/conformance_tests/gatherElements.https.any.html?cpu",
        {
@@ -786168,8 +788513,227 @@
        }
       ]
      ],
+     "gatherND.https.any.js": [
+      "e8f31d5617b40879853fcd9df31aa1d51cfaf796",
+      [
+       "webnn/conformance_tests/gatherND.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/gatherND.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/gatherND.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/gatherND.https.any.worker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/gatherND.https.any.worker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/gatherND.https.any.worker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "gelu.https.any.js": [
-      "446c5bc4effb9727c3577b588f361952ba3ee0ae",
+      "aa72bb65c83fb63c676482503b709b4b5feb2ddf",
       [
        "webnn/conformance_tests/gelu.https.any.html?cpu",
        {
@@ -786388,7 +788952,7 @@
       ]
      ],
      "gemm.https.any.js": [
-      "70b2ecb5e1e72670eefa03994020bc13e41e87e4",
+      "099486c7f58072b1c91b3360b0e712eda299a05b",
       [
        "webnn/conformance_tests/gemm.https.any.html?cpu",
        {
@@ -786607,7 +789171,7 @@
       ]
      ],
      "greater.https.any.js": [
-      "e9a63b1682a69ca3ad988ed7e6bd377d7ad6589c",
+      "7017d0860d5b6919f97d1081aed790d6a8fdeb61",
       [
        "webnn/conformance_tests/greater.https.any.html?cpu",
        {
@@ -786826,7 +789390,7 @@
       ]
      ],
      "greater_or_equal.https.any.js": [
-      "2f2f572eba3be796aa0a53a7b6b9888851ee62b1",
+      "36cb9900ae4871e48601360e818cece31f0afe89",
       [
        "webnn/conformance_tests/greater_or_equal.https.any.html?cpu",
        {
@@ -787045,7 +789609,7 @@
       ]
      ],
      "gru.https.any.js": [
-      "15f585ba9144f42f348f1da5c39b3da299d57246",
+      "4a144cce8484685f3ec855416ea47021b8619083",
       [
        "webnn/conformance_tests/gru.https.any.html?cpu",
        {
@@ -787264,7 +789828,7 @@
       ]
      ],
      "gru_cell.https.any.js": [
-      "3d7e69fb9fb302a3db43b7b06bc90a052363a7d2",
+      "6155a37490da5a9b290fc606c6b2ee725f29adab",
       [
        "webnn/conformance_tests/gru_cell.https.any.html?cpu",
        {
@@ -787483,7 +790047,7 @@
       ]
      ],
      "hard_sigmoid.https.any.js": [
-      "4ab915958e1d044cd91b3c9e30aedc13bc0f43b2",
+      "af8c3918f3defea06ae457af28322d283b424d3a",
       [
        "webnn/conformance_tests/hard_sigmoid.https.any.html?cpu",
        {
@@ -787702,7 +790266,7 @@
       ]
      ],
      "hard_swish.https.any.js": [
-      "480b696d77fad72f18771955c517b866160fa4e3",
+      "e9c341b770706e4d7f31ba6bb356698939f20d7d",
       [
        "webnn/conformance_tests/hard_swish.https.any.html?cpu",
        {
@@ -787921,7 +790485,7 @@
       ]
      ],
      "identity.https.any.js": [
-      "ca4239145b142cb27d85f1ce89d5a910835e5168",
+      "6e1b1e7f6db7cffe920e34c856ef08ca12540485",
       [
        "webnn/conformance_tests/identity.https.any.html?cpu",
        {
@@ -788140,7 +790704,7 @@
       ]
      ],
      "inputs-are-not-modified.https.any.js": [
-      "f3a1d14fd5301a17742c4a7882c5d14a61c34cd4",
+      "ffd2d93a557f69798d5e975bad5f0db1f483690d",
       [
        "webnn/conformance_tests/inputs-are-not-modified.https.any.html?cpu",
        {
@@ -788359,7 +790923,7 @@
       ]
      ],
      "instance_normalization.https.any.js": [
-      "5790b20d8e802543ed8a1697971de39d50081251",
+      "46f434bd245d4fbbab59ac493bcda6671b67c2e1",
       [
        "webnn/conformance_tests/instance_normalization.https.any.html?cpu",
        {
@@ -788578,7 +791142,7 @@
       ]
      ],
      "layer_normalization.https.any.js": [
-      "84b90ca2779e2027294a212a468b325bd5999bcc",
+      "23ba642e2426bc77e4518b750d6d59b446cc8fe2",
       [
        "webnn/conformance_tests/layer_normalization.https.any.html?cpu",
        {
@@ -788797,7 +791361,7 @@
       ]
      ],
      "leaky_relu.https.any.js": [
-      "f14489b1295a0722fc59642b329aa8756dd9c684",
+      "f49c2d02809afaa10c83f68e7cb4a477fc473352",
       [
        "webnn/conformance_tests/leaky_relu.https.any.html?cpu",
        {
@@ -789016,7 +791580,7 @@
       ]
      ],
      "lesser.https.any.js": [
-      "f7200bc21d8a1d8b33c9f088c28f12a976228291",
+      "322209f18a1818a52a5e03b6944420d340e8977c",
       [
        "webnn/conformance_tests/lesser.https.any.html?cpu",
        {
@@ -789235,7 +791799,7 @@
       ]
      ],
      "lesser_or_equal.https.any.js": [
-      "fce69f611253b6a2410b5d5b268df43cac5b4f39",
+      "aceec9dc135ff61c9c3ed64495d8c58e1b8f2352",
       [
        "webnn/conformance_tests/lesser_or_equal.https.any.html?cpu",
        {
@@ -789454,7 +792018,7 @@
       ]
      ],
      "linear.https.any.js": [
-      "da4115bcfa62a0cf768382236efe04c55941446d",
+      "a959403aff4a6f418c882df4a6dd0de6c54f445d",
       [
        "webnn/conformance_tests/linear.https.any.html?cpu",
        {
@@ -789673,7 +792237,7 @@
       ]
      ],
      "log.https.any.js": [
-      "a8d5b006ebbb6ac9e8835adcc6433228274bee44",
+      "8d6b5885c28f1d17aab4ca282db27d830b2ddf40",
       [
        "webnn/conformance_tests/log.https.any.html?cpu",
        {
@@ -789892,7 +792456,7 @@
       ]
      ],
      "logical_not.https.any.js": [
-      "51db74cd3ae2178c293d88b4b87dd1c1fbe2a15a",
+      "e56c5626ef8ab7c43971adf6556a351f803fc52e",
       [
        "webnn/conformance_tests/logical_not.https.any.html?cpu",
        {
@@ -790111,7 +792675,7 @@
       ]
      ],
      "lstm.https.any.js": [
-      "8b6cf73715c5247bbdec8f215682244af438174d",
+      "20198bfb2f5cede820bcc662a2498d003642e050",
       [
        "webnn/conformance_tests/lstm.https.any.html?cpu",
        {
@@ -790330,7 +792894,7 @@
       ]
      ],
      "lstm_cell.https.any.js": [
-      "9bc71a6224c937a04e2944f787ee9b2f17c4e02d",
+      "d6b16029b0df4621837889fa82184145b7e8ccdf",
       [
        "webnn/conformance_tests/lstm_cell.https.any.html?cpu",
        {
@@ -790549,7 +793113,7 @@
       ]
      ],
      "matmul.https.any.js": [
-      "888e511dfdbd23893e3d7b414668f3515684c810",
+      "ef0b7f20051d199afcbdd306fb0f540d19b40967",
       [
        "webnn/conformance_tests/matmul.https.any.html?cpu",
        {
@@ -790768,7 +793332,7 @@
       ]
      ],
      "max.https.any.js": [
-      "0c28b85994da6e6482b529477ea0d7517ae8d29c",
+      "08befe3da0cbaff6ebb4288837e5a1e248e58eca",
       [
        "webnn/conformance_tests/max.https.any.html?cpu",
        {
@@ -790987,7 +793551,7 @@
       ]
      ],
      "min.https.any.js": [
-      "2892bc1ec0f21fa893b0aac115bbdcd2412058b5",
+      "1dda0bb44a77883d9a8689272126ec2617faaeeb",
       [
        "webnn/conformance_tests/min.https.any.html?cpu",
        {
@@ -791206,7 +793770,7 @@
       ]
      ],
      "mul.https.any.js": [
-      "d46a4d9074464d48076bb21a4b340262aa8e3725",
+      "27a5dbd32499157c7ddba47030e67adf9c70bfa4",
       [
        "webnn/conformance_tests/mul.https.any.html?cpu",
        {
@@ -791425,7 +793989,7 @@
       ]
      ],
      "neg.https.any.js": [
-      "8ffe3623567206786e0a4785a75ea18ea9d1b7b9",
+      "a77109a9ef1a7861cceabe597ed6d2207c31bf7e",
       [
        "webnn/conformance_tests/neg.https.any.html?cpu",
        {
@@ -791644,7 +794208,7 @@
       ]
      ],
      "pad.https.any.js": [
-      "c05f18f83c2800fc5511eebf7116696982f55a61",
+      "203d0b7299c57204e3ffa4480fa6595979594f3d",
       [
        "webnn/conformance_tests/pad.https.any.html?cpu",
        {
@@ -791863,7 +794427,7 @@
       ]
      ],
      "parallel-compute.https.any.js": [
-      "3b9c41276ad3cb9ef993fcf3184d5d3bf0c207ff",
+      "a1c20f1ff30d621bb3f5c46048f6f53ceff12317",
       [
        "webnn/conformance_tests/parallel-compute.https.any.html?cpu",
        {
@@ -792082,7 +794646,7 @@
       ]
      ],
      "parallel-dispatch.https.any.js": [
-      "5594d845d9beb7eaa56979e8474cbb6c9be62f92",
+      "dfdf70a6aa46fed4aabc9d9db32f5f4c9912dfee",
       [
        "webnn/conformance_tests/parallel-dispatch.https.any.html?cpu",
        {
@@ -792301,7 +794865,7 @@
       ]
      ],
      "pooling.https.any.js": [
-      "9dfd6ba0ca4b4a2dbfd2448a947c9b13da4f00f6",
+      "52c6c80c7b53b52a374d7ec330ebad495d6da8b9",
       [
        "webnn/conformance_tests/pooling.https.any.html?cpu",
        {
@@ -792520,7 +795084,7 @@
       ]
      ],
      "pow.https.any.js": [
-      "3da766df69df6184d719789bcdfbb9ab8773d439",
+      "fa18368d94e92f3b1d6e6bc678e00a2d415c9cda",
       [
        "webnn/conformance_tests/pow.https.any.html?cpu",
        {
@@ -792739,7 +795303,7 @@
       ]
      ],
      "prelu.https.any.js": [
-      "4730d4e2d17ac5f694a9e6a69c1648a4c7740e33",
+      "02f545ad5964c3c7ba568ca5c1d24215d4943389",
       [
        "webnn/conformance_tests/prelu.https.any.html?cpu",
        {
@@ -792958,7 +795522,7 @@
       ]
      ],
      "quantizeLinear.https.any.js": [
-      "acae378d80b42eb9f8e7b648d98dfa78bafe58d4",
+      "0871c881b717b7eae1a8c016a363c4b39b59d63f",
       [
        "webnn/conformance_tests/quantizeLinear.https.any.html?cpu",
        {
@@ -793177,7 +795741,7 @@
       ]
      ],
      "reciprocal.https.any.js": [
-      "a97c00e2b996ba13b052a4ec79e2208ab5b2e384",
+      "bbf49a1e0ac46a0b8805a809b4d50bf1f1a1ff27",
       [
        "webnn/conformance_tests/reciprocal.https.any.html?cpu",
        {
@@ -793396,7 +795960,7 @@
       ]
      ],
      "reduce_l1.https.any.js": [
-      "f15de087cf0ae164569e93c26afd6525fe3e8c8a",
+      "8fa1b4c09c28ce0fe8fd21975cea07a53df240cc",
       [
        "webnn/conformance_tests/reduce_l1.https.any.html?cpu",
        {
@@ -793615,7 +796179,7 @@
       ]
      ],
      "reduce_l2.https.any.js": [
-      "7c1d45434620306203c05b2c9365e2caff4b1f70",
+      "7fc2ee8e621214073ff532d28fa49f6f3180ba44",
       [
        "webnn/conformance_tests/reduce_l2.https.any.html?cpu",
        {
@@ -793834,7 +796398,7 @@
       ]
      ],
      "reduce_log_sum.https.any.js": [
-      "47a88732dedc937b32d58d548e8fea35676bf3d8",
+      "5ed23e1af47d968326fd1a8c2526aa56db8fbded",
       [
        "webnn/conformance_tests/reduce_log_sum.https.any.html?cpu",
        {
@@ -794053,7 +796617,7 @@
       ]
      ],
      "reduce_log_sum_exp.https.any.js": [
-      "5ba2e39307784618975c2cb1bbeba3a048d11fe0",
+      "e9a0b7b54930e1f995882eef1619047e2d298973",
       [
        "webnn/conformance_tests/reduce_log_sum_exp.https.any.html?cpu",
        {
@@ -794272,7 +796836,7 @@
       ]
      ],
      "reduce_max.https.any.js": [
-      "709b25b0ad311e4717cc1b857c1412d98617f9fe",
+      "5096e553239cb84acb8364ab0f23385547e1dc37",
       [
        "webnn/conformance_tests/reduce_max.https.any.html?cpu",
        {
@@ -794491,7 +797055,7 @@
       ]
      ],
      "reduce_mean.https.any.js": [
-      "21fa1a5102c703c4aaded366df4f30b19f83075f",
+      "ee5bf3673c08e0b378b76c9c75d404819fde1d09",
       [
        "webnn/conformance_tests/reduce_mean.https.any.html?cpu",
        {
@@ -794710,7 +797274,7 @@
       ]
      ],
      "reduce_min.https.any.js": [
-      "6cc38d6a0782ab8f5a7191b591776483a4fe73fc",
+      "7a5989045db858baccc022f8860987e3f0e38be8",
       [
        "webnn/conformance_tests/reduce_min.https.any.html?cpu",
        {
@@ -794929,7 +797493,7 @@
       ]
      ],
      "reduce_product.https.any.js": [
-      "745f83b3ceabc47193762c0fdeca2df2a519e7ef",
+      "1a2e23c4f76e124dbc6990db83e03fba102e1090",
       [
        "webnn/conformance_tests/reduce_product.https.any.html?cpu",
        {
@@ -795148,7 +797712,7 @@
       ]
      ],
      "reduce_sum.https.any.js": [
-      "9aec31d3f6826bd5113cfa430bf8c276d6351983",
+      "6b91802745552743f2e8c8dbd14aaa5de38944f5",
       [
        "webnn/conformance_tests/reduce_sum.https.any.html?cpu",
        {
@@ -795367,7 +797931,7 @@
       ]
      ],
      "reduce_sum_square.https.any.js": [
-      "10930c44c6e7bd47703973d19966fef393a1b566",
+      "0f92d817e6157c3f278cc549c5ae13a8b9619a78",
       [
        "webnn/conformance_tests/reduce_sum_square.https.any.html?cpu",
        {
@@ -795586,7 +798150,7 @@
       ]
      ],
      "relu.https.any.js": [
-      "45388383fffe1ec681fd581d7a717215d0921485",
+      "ea7fd9b9552b29cb5419f96d4291def27b2de554",
       [
        "webnn/conformance_tests/relu.https.any.html?cpu",
        {
@@ -795805,7 +798369,7 @@
       ]
      ],
      "resample2d.https.any.js": [
-      "65faca22abdddb36e3938e3e4f45cd2ddf0c0aec",
+      "c10b4182ec0c5e9d22e72c594ef2b28ff85999cf",
       [
        "webnn/conformance_tests/resample2d.https.any.html?cpu",
        {
@@ -796024,7 +798588,7 @@
       ]
      ],
      "reshape.https.any.js": [
-      "212e93575bc04636b5d72eae5c2691c72c2a6409",
+      "23a8675e13f9bbbf4e8fcf8cc4e525fa9637d631",
       [
        "webnn/conformance_tests/reshape.https.any.html?cpu",
        {
@@ -796242,8 +798806,227 @@
        }
       ]
      ],
+     "scatterND.https.any.js": [
+      "002ee3e4914e7a2d4d2c4d68c27743ddd596a9ae",
+      [
+       "webnn/conformance_tests/scatterND.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/scatterND.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/scatterND.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/scatterND.https.any.worker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/scatterND.https.any.worker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/scatterND.https.any.worker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API scatterND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "sigmoid.https.any.js": [
-      "5bcdb39969c69231e964a7a5bee04203fa001322",
+      "2149de9573a48cbc63be56418ad4c82127d17bb9",
       [
        "webnn/conformance_tests/sigmoid.https.any.html?cpu",
        {
@@ -796462,7 +799245,7 @@
       ]
      ],
      "sign.https.any.js": [
-      "e00c6b7050126d476932bfe987f293bbf540845f",
+      "aad8685447153411fe5f4f0acd789e30fdbf6f3a",
       [
        "webnn/conformance_tests/sign.https.any.html?cpu",
        {
@@ -796681,7 +799464,7 @@
       ]
      ],
      "sin.https.any.js": [
-      "30fc9a54f8f02bdec3e4493bee38c8b4e3af30b1",
+      "d0dd150c6c2f9048aef6475921009d21a981fab0",
       [
        "webnn/conformance_tests/sin.https.any.html?cpu",
        {
@@ -796900,7 +799683,7 @@
       ]
      ],
      "slice.https.any.js": [
-      "1c53d45fd5c05218a3542c307f5acc409be16a96",
+      "58604d2b8ebf929de38c4cb98e0e99ae7b7386e7",
       [
        "webnn/conformance_tests/slice.https.any.html?cpu",
        {
@@ -797119,7 +799902,7 @@
       ]
      ],
      "softmax.https.any.js": [
-      "28c0ff5ecac22930636a156198ae0fac89396cbf",
+      "a364f65ccc1f1301fe7b57c6d41111470e9cada9",
       [
        "webnn/conformance_tests/softmax.https.any.html?cpu",
        {
@@ -797338,7 +800121,7 @@
       ]
      ],
      "softplus.https.any.js": [
-      "2b45700493edadf94acbfebcadae339f4dd5786f",
+      "0294172dd035c71382f6676cfe1e8ebef1ad393a",
       [
        "webnn/conformance_tests/softplus.https.any.html?cpu",
        {
@@ -797557,7 +800340,7 @@
       ]
      ],
      "softsign.https.any.js": [
-      "06560af48a5fb656c3eb8adbc2317e1da1a1573a",
+      "344701e210af9dec4b9b7009dbfd7a57e121c29a",
       [
        "webnn/conformance_tests/softsign.https.any.html?cpu",
        {
@@ -797776,7 +800559,7 @@
       ]
      ],
      "split.https.any.js": [
-      "eee757f29766df13e1eb8cff92198a7586325a7e",
+      "461afce9ab9c4b51ba6f368417fcd2f6fb710339",
       [
        "webnn/conformance_tests/split.https.any.html?cpu",
        {
@@ -797995,7 +800778,7 @@
       ]
      ],
      "sqrt.https.any.js": [
-      "aa24dc5501f3fd325c935dcc531febb2ab7a4824",
+      "b6b13ec07595feb29a9cb20df70524dceba970e2",
       [
        "webnn/conformance_tests/sqrt.https.any.html?cpu",
        {
@@ -798214,7 +800997,7 @@
       ]
      ],
      "sub.https.any.js": [
-      "c034cf7b0ada3816691a73cb5ce7b3154ca2ae17",
+      "3bb23caf5f519d8cba099bcce8f3149bb2085daf",
       [
        "webnn/conformance_tests/sub.https.any.html?cpu",
        {
@@ -798432,8 +801215,227 @@
        }
       ]
      ],
+     "subgraph.https.any.js": [
+      "172c59a83b17b3f754ff75070ec91c03b9fb327d",
+      [
+       "webnn/conformance_tests/subgraph.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/subgraph.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/subgraph.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/subgraph.https.any.worker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/subgraph.https.any.worker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/subgraph.https.any.worker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN API subgraph with multiple operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "tan.https.any.js": [
-      "5fcf0e689968551cce42716f59cf9e4b39e86d56",
+      "a8b6bba13c17c0349329602c48823c6273ca9678",
       [
        "webnn/conformance_tests/tan.https.any.html?cpu",
        {
@@ -798652,7 +801654,7 @@
       ]
      ],
      "tanh.https.any.js": [
-      "8fc7317a2cf56627a4bae7c69dbef44ddc0b66bc",
+      "211ae972ebbdfc662d9cea84211250e7723bd58e",
       [
        "webnn/conformance_tests/tanh.https.any.html?cpu",
        {
@@ -798871,7 +801873,7 @@
       ]
      ],
      "tensor.https.any.js": [
-      "68153b8afd4224efdc0f99d0631b292cb3e6a434",
+      "51905bbaf3c590ee3f5c2e801ae9988c5cb37152",
       [
        "webnn/conformance_tests/tensor.https.any.html?cpu",
        {
@@ -799114,7 +802116,7 @@
       ]
      ],
      "tile.https.any.js": [
-      "427fd2160159cfc2df2c9e60027c2d7b516a1bc8",
+      "f85518e52486058d8af9a5f5ff8eefcb2e4241d7",
       [
        "webnn/conformance_tests/tile.https.any.html?cpu",
        {
@@ -799333,7 +802335,7 @@
       ]
      ],
      "transpose.https.any.js": [
-      "61f043a9b0fcef01419c577052dbf33878e5adae",
+      "4370c63de4ab7c3e69fda7f588ff67f8abe17870",
       [
        "webnn/conformance_tests/transpose.https.any.html?cpu",
        {
@@ -799552,7 +802554,7 @@
       ]
      ],
      "triangular.https.any.js": [
-      "7c79518d43f9514510bb611f2add6c1a5f2f6573",
+      "64a33e4a4c2d10d97692ab898eee51c5acb99fdb",
       [
        "webnn/conformance_tests/triangular.https.any.html?cpu",
        {
@@ -799771,7 +802773,7 @@
       ]
      ],
      "where.https.any.js": [
-      "957f82860839e0edb0b6d9a19e4a9b792fe8afc0",
+      "1c1860fd9a1e0c011552a909e8d0d826a4e2ce0b",
       [
        "webnn/conformance_tests/where.https.any.html?cpu",
        {
@@ -799991,7 +802993,7 @@
      ]
     },
     "idlharness.https.any.js": [
-     "6c95e534a4cd6b597beedddbf46969bf19a134f6",
+     "905744ffea61273bd4fd3c5e817a0e7e735eb2fd",
      [
       "webnn/idlharness.https.any.html",
       {
@@ -800051,7 +803053,7 @@
     ],
     "validation_tests": {
      "argMinMax.https.any.js": [
-      "3d3f714871581f7e1f0814945a0032cbe6d98f93",
+      "abd4e878a2a58978302491f50ae63107f258cedd",
       [
        "webnn/validation_tests/argMinMax.https.any.html?cpu",
        {
@@ -800240,7 +803242,7 @@
       ]
      ],
      "batchNormalization.https.any.js": [
-      "6a884de3ee3301df229213a8c2be0821108fe458",
+      "636f803ecb7ee32b0307cc3a8f465b8240513d9a",
       [
        "webnn/validation_tests/batchNormalization.https.any.html?cpu",
        {
@@ -800429,7 +803431,7 @@
       ]
      ],
      "build-more-than-once.https.any.js": [
-      "c4cbcae8f32d60b31060a46455a26fe842ce66a5",
+      "3d648c9b0191f12367b23535557a0b15320fcd18",
       [
        "webnn/validation_tests/build-more-than-once.https.any.html?cpu",
        {
@@ -800618,7 +803620,7 @@
       ]
      ],
      "cast.https.any.js": [
-      "b20d8186900619f2cd053fa38b6e16c490b0e2f9",
+      "0dee2f0f07104071ddb8baa959b09b488c4aeeee",
       [
        "webnn/validation_tests/cast.https.any.html?cpu",
        {
@@ -800807,7 +803809,7 @@
       ]
      ],
      "clamp.https.any.js": [
-      "10cf0028e5248425574132b45bff8781cf80088c",
+      "e76092daf43adb851c57890e8b332b21fd66ebb3",
       [
        "webnn/validation_tests/clamp.https.any.html?cpu",
        {
@@ -800996,7 +803998,7 @@
       ]
      ],
      "compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.js": [
-      "65bd805c31f6b1f282b30b66da92cc7cc644181b",
+      "097a8f84d8b00095e8ace4de5065ac8345b4c243",
       [
        "webnn/validation_tests/compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.html?cpu",
        {
@@ -801185,7 +804187,7 @@
       ]
      ],
      "concat.https.any.js": [
-      "4902caf6619c606aa7155111b9584aa4563fcfd7",
+      "65c56a842461e655234f2003c4d3e530f3fd324a",
       [
        "webnn/validation_tests/concat.https.any.html?cpu",
        {
@@ -801374,7 +804376,7 @@
       ]
      ],
      "constant-changed-buffer.https.any.js": [
-      "1a516c0b1d4f26dc87dc414a7c98d5579ea5a329",
+      "40f3a0ccaef2c2888d2d773cf1825a49197697a8",
       [
        "webnn/validation_tests/constant-changed-buffer.https.any.html?cpu",
        {
@@ -801563,7 +804565,7 @@
       ]
      ],
      "constant.https.any.js": [
-      "d101d92fb80970940ee10af169af584734f7bc83",
+      "b9b75e372b0169ca459def7a9152873c78c70bce",
       [
        "webnn/validation_tests/constant.https.any.html?cpu",
        {
@@ -801752,7 +804754,7 @@
       ]
      ],
      "conv2d.https.any.js": [
-      "84f6a5975c1f83b7225885ffbd2525ceb06fe03d",
+      "405538ff4d8040e157a8c332f6a89816294c6e3c",
       [
        "webnn/validation_tests/conv2d.https.any.html?cpu",
        {
@@ -801941,7 +804943,7 @@
       ]
      ],
      "convTranspose2d.https.any.js": [
-      "2c4e9dc442843d71a1a63e2b02050364cc7f90ba",
+      "c128903e9cc51fc738067eb0bbc43d8e656dd1bf",
       [
        "webnn/validation_tests/convTranspose2d.https.any.html?cpu",
        {
@@ -802319,7 +805321,7 @@
       ]
      ],
      "cumulativeSum.https.any.js": [
-      "65eef7ed89d1beba37845e4fa23a30fff8f62efe",
+      "6381d674ab4e9503805f9aa0529d940d491f79b5",
       [
        "webnn/validation_tests/cumulativeSum.https.any.html?cpu",
        {
@@ -802508,7 +805510,7 @@
       ]
      ],
      "dequantizeLinear.https.any.js": [
-      "45a3187f65b3107d1ddd981f368ddd7ae35d3df3",
+      "a5e6c8ea50e199da2b90d6a6873ccc490403c71e",
       [
        "webnn/validation_tests/dequantizeLinear.https.any.html?cpu",
        {
@@ -802697,7 +805699,7 @@
       ]
      ],
      "destroyContext.https.any.js": [
-      "4ec31033a6d3129a639fc46cee78baadbd8ba1fd",
+      "b4027e23dba0f1d5fe527def8e3fa3a323049ff7",
       [
        "webnn/validation_tests/destroyContext.https.any.html?cpu",
        {
@@ -802892,7 +805894,7 @@
       ]
      ],
      "destroyGraph.https.any.js": [
-      "9fd3a9e1ff7edfc6acab0ced0e9df617474213fd",
+      "f7eb01eafef7ef57676c8b9d21a5579503da6d8a",
       [
        "webnn/validation_tests/destroyGraph.https.any.html?cpu",
        {
@@ -803087,7 +806089,7 @@
       ]
      ],
      "elementwise-binary.https.any.js": [
-      "fc0616f569b3970a5b274017e676c180f4623b9a",
+      "e578a343468f018e57f5fa37941c1915647084d4",
       [
        "webnn/validation_tests/elementwise-binary.https.any.html?cpu",
        {
@@ -803654,7 +806656,7 @@
       ]
      ],
      "elu.https.any.js": [
-      "4236925aed188ea4e09072d95dc54b0c6087841b",
+      "4fe08b1b0cef1837431d23d9225f9a34792c63e5",
       [
        "webnn/validation_tests/elu.https.any.html?cpu",
        {
@@ -803843,7 +806845,7 @@
       ]
      ],
      "expand.https.any.js": [
-      "4edc9a718a4ff14daf9aa41d2be7b97b0c682734",
+      "23fe94aedc1eb18e5c0a98bc50e49a2bf15eba2b",
       [
        "webnn/validation_tests/expand.https.any.html?cpu",
        {
@@ -804032,7 +807034,7 @@
       ]
      ],
      "gather.https.any.js": [
-      "ec728314a3c01cbac1542238c68fdf842c4a535e",
+      "dbeacbfc2791f0211358700d22d1ce4e41e1339b",
       [
        "webnn/validation_tests/gather.https.any.html?cpu",
        {
@@ -804221,7 +807223,7 @@
       ]
      ],
      "gatherElements.https.any.js": [
-      "ed8af8da33041ecc8aaa558584b1d12f51709da5",
+      "4c4b04490e8b6cacaba20806ec988c8d5d4ba620",
       [
        "webnn/validation_tests/gatherElements.https.any.html?cpu",
        {
@@ -804409,6 +807411,195 @@
        }
       ]
      ],
+     "gatherND.https.any.js": [
+      "a8bfa2b336bf56238014665a70ca46ac00b6c541",
+      [
+       "webnn/validation_tests/gatherND.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "webnn/validation_tests/gatherND.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "webnn/validation_tests/gatherND.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "webnn/validation_tests/gatherND.https.any.worker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "webnn/validation_tests/gatherND.https.any.worker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "webnn/validation_tests/gatherND.https.any.worker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API gatherND operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ]
+        ]
+       }
+      ]
+     ],
      "gelu.https.any.js": [
       "c02c2923af49540d9da82819917e5d983eeedeee",
       [
@@ -804599,7 +807790,7 @@
       ]
      ],
      "gemm.https.any.js": [
-      "30cddcf5ec5e057711f0c0db3e3ca44acb89d5cd",
+      "cad1806b5ff918b82b75f83a79f082a3f97edc6e",
       [
        "webnn/validation_tests/gemm.https.any.html?cpu",
        {
@@ -804788,7 +807979,7 @@
       ]
      ],
      "gru.https.any.js": [
-      "2b168979d075c3468d69363ca7cb69205d8863d0",
+      "158384a4b78777f552ce68a09c0fea4f085b473d",
       [
        "webnn/validation_tests/gru.https.any.html?cpu",
        {
@@ -804977,7 +808168,7 @@
       ]
      ],
      "gruCell.https.any.js": [
-      "9c0c6d17cc49e5f2715bb5e3a72fcda6c07172cb",
+      "7bbb9afcff0eac56813336ac66f641be73fd6c8b",
       [
        "webnn/validation_tests/gruCell.https.any.html?cpu",
        {
@@ -805166,7 +808357,7 @@
       ]
      ],
      "hardSigmoid.https.any.js": [
-      "c4ea4e1296ba6e6d0aec8abfa502f644ce1369c6",
+      "8134863a3112c8caed6f1e4845c28ea3e2799975",
       [
        "webnn/validation_tests/hardSigmoid.https.any.html?cpu",
        {
@@ -805544,7 +808735,7 @@
       ]
      ],
      "input.https.any.js": [
-      "07d9185cee6bd22d89fb0ac9fcd3a5c2e6942570",
+      "0649c67f086e16beb8665de28210573a55987034",
       [
        "webnn/validation_tests/input.https.any.html?cpu",
        {
@@ -805733,7 +808924,7 @@
       ]
      ],
      "instanceNormalization.https.any.js": [
-      "36652dd7264f5dce89650c66d2de894a8fd177c2",
+      "618be23fdec86a317c79f018567bd4a3478c05fd",
       [
        "webnn/validation_tests/instanceNormalization.https.any.html?cpu",
        {
@@ -805922,7 +809113,7 @@
       ]
      ],
      "invalid-rank.https.any.js": [
-      "59f5ac52337533916efcab14d9698f4d7c84b683",
+      "93dfa105c6bd040fb97ecc0bb26623682a523209",
       [
        "webnn/validation_tests/invalid-rank.https.any.html?cpu",
        {
@@ -806111,7 +809302,7 @@
       ]
      ],
      "layerNormalization.https.any.js": [
-      "2eff16888c29f7b6e068caa4cf83306fb502dcdf",
+      "97bb479f04d4ae054fcec82fcada7c72b8d2982b",
       [
        "webnn/validation_tests/layerNormalization.https.any.html?cpu",
        {
@@ -806300,7 +809491,7 @@
       ]
      ],
      "leakyRelu.https.any.js": [
-      "6766763cd749aa33a3dcc72e0409942b03cc15f8",
+      "c49ac659ef4d7de696f066e04dcaced764c8e482",
       [
        "webnn/validation_tests/leakyRelu.https.any.html?cpu",
        {
@@ -806489,7 +809680,7 @@
       ]
      ],
      "linear.https.any.js": [
-      "e1243bb73fd53b832f5de926afe86ca225717c3c",
+      "816dad35039a307cbf7365140e9d42ecc2b4d42e",
       [
        "webnn/validation_tests/linear.https.any.html?cpu",
        {
@@ -806678,7 +809869,7 @@
       ]
      ],
      "lstm.https.any.js": [
-      "5d4f7ee6db285890742a7d5183151b11ea1bf354",
+      "8cc2a014a7c4aa4f19ca75778f2b7b0a700479d3",
       [
        "webnn/validation_tests/lstm.https.any.html?cpu",
        {
@@ -806867,7 +810058,7 @@
       ]
      ],
      "lstmCell.https.any.js": [
-      "59f81fa319aebabf902e713eda9636179978768e",
+      "a739761d56ea7e8ac0cb7cd1547942b018a13d2a",
       [
        "webnn/validation_tests/lstmCell.https.any.html?cpu",
        {
@@ -807056,7 +810247,7 @@
       ]
      ],
      "matmul.https.any.js": [
-      "981d8f35708d8b731c753fc0f092d461fc61b30f",
+      "4f8a1ee59a3816c93c992b2c29c6a4d6f14d8d2d",
       [
        "webnn/validation_tests/matmul.https.any.html?cpu",
        {
@@ -807245,7 +810436,7 @@
       ]
      ],
      "pad.https.any.js": [
-      "3f5c30b84cb8e99fcdf92220afc8b9262470cc3a",
+      "b45f68ab0141149ecb0ec49e29bad1fcd0cc4efe",
       [
        "webnn/validation_tests/pad.https.any.html?cpu",
        {
@@ -807434,7 +810625,7 @@
       ]
      ],
      "pooling-and-reduction-keep-dims.https.any.js": [
-      "5a30aaf02be49fd8843e6378f4ff90ceb5f0cea6",
+      "3beee94cd44dcd6898357a0530ad1b8728d644f0",
       [
        "webnn/validation_tests/pooling-and-reduction-keep-dims.https.any.html?cpu",
        {
@@ -807677,7 +810868,7 @@
       ]
      ],
      "pooling.https.any.js": [
-      "119132cf638f564b4b388c22f0db81058cdb014e",
+      "d862d807ab443a90fff9b671eeec23d2bdab0c8a",
       [
        "webnn/validation_tests/pooling.https.any.html?cpu",
        {
@@ -807866,7 +811057,7 @@
       ]
      ],
      "prelu.https.any.js": [
-      "9c01d6edae3a9ae960e1eefa4ff120176c04da25",
+      "94eb6995374e651c5af79b407e7706547ca5d437",
       [
        "webnn/validation_tests/prelu.https.any.html?cpu",
        {
@@ -808055,7 +811246,7 @@
       ]
      ],
      "quantizeLinear.https.any.js": [
-      "154f455a4921a75fed7a1e3182f0e883c89a046f",
+      "2f0b21d225a8cbda190f29b8c2471e5c6ceec7de",
       [
        "webnn/validation_tests/quantizeLinear.https.any.html?cpu",
        {
@@ -808244,7 +811435,7 @@
       ]
      ],
      "reduction.https.any.js": [
-      "cb0d344b4f127deaceacf9172f2c967467d9e5c5",
+      "b56306351f05e60ae37b2ab2a4d22d6853c6dd52",
       [
        "webnn/validation_tests/reduction.https.any.html?cpu",
        {
@@ -808622,7 +811813,7 @@
       ]
      ],
      "resample2d.https.any.js": [
-      "dd9916aefe099c625ff0170bb90ad126f0d5ab42",
+      "df2b85d02de25a7577baa01f6e3a5cae309445da",
       [
        "webnn/validation_tests/resample2d.https.any.html?cpu",
        {
@@ -808811,7 +812002,7 @@
       ]
      ],
      "reshape.https.any.js": [
-      "7bf4a523c28f27603baf33af8146c7e7f636f9fb",
+      "7e49cada67a20702faf2dafe3efee5a87525f59a",
       [
        "webnn/validation_tests/reshape.https.any.html?cpu",
        {
@@ -809000,7 +812191,7 @@
       ]
      ],
      "scatterND.https.any.js": [
-      "18fcb40e892eb4e9237f5cb1061fa6ad82e16669",
+      "5e28471fffa47aa985bc2d6a681156a029f7661b",
       [
        "webnn/validation_tests/scatterND.https.any.html?cpu",
        {
@@ -809378,7 +812569,7 @@
       ]
      ],
      "slice.https.any.js": [
-      "d2ca2c678f06e612ab5fff573afdc191b6cd90bc",
+      "3fb3cdcd6f67a81aec49fe221c279c8f1c36d7d5",
       [
        "webnn/validation_tests/slice.https.any.html?cpu",
        {
@@ -809567,7 +812758,7 @@
       ]
      ],
      "softmax.https.any.js": [
-      "8c9e65f6eee6880cdfaf8de691bec791c180fb44",
+      "4a5ee563070fb7ac1c17930f8140cae91b6cb125",
       [
        "webnn/validation_tests/softmax.https.any.html?cpu",
        {
@@ -810134,7 +813325,7 @@
       ]
      ],
      "split.https.any.js": [
-      "31b0c449385fc1613b0949b5986fdacd01430168",
+      "c25f839168d39aa002d2e2ab6435f7075c593953",
       [
        "webnn/validation_tests/split.https.any.html?cpu",
        {
@@ -810512,7 +813703,7 @@
       ]
      ],
      "tile.https.any.js": [
-      "d6b24b6c3892a0831b18ab52a933f8367d7b6b92",
+      "6ad81cba4beb70b1d71c1c781aa032216f01b125",
       [
        "webnn/validation_tests/tile.https.any.html?cpu",
        {
@@ -810701,7 +813892,7 @@
       ]
      ],
      "transpose.https.any.js": [
-      "d6d250d792223ea8838b177f1bafc0f1679f6937",
+      "a79e14008a6abe18abb56be37d968cace793f5a6",
       [
        "webnn/validation_tests/transpose.https.any.html?cpu",
        {
@@ -810890,7 +814081,7 @@
       ]
      ],
      "triangular.https.any.js": [
-      "0995d21d692bee0fd137bdc18a8c9cebb9f73fd1",
+      "bfeb716f9c4a341898f407d33acecb5c9e897d2f",
       [
        "webnn/validation_tests/triangular.https.any.html?cpu",
        {
@@ -811079,7 +814270,7 @@
       ]
      ],
      "where.https.any.js": [
-      "884b4857317fb4d88f4de98ad198a35c4506c78b",
+      "2f1941556b1c3a3d8c04502e6f7e2beb5cdd0669",
       [
        "webnn/validation_tests/where.https.any.html?cpu",
        {
@@ -811631,7 +814822,7 @@
      ]
     ],
     "RTCPeerConnection-generateCertificate.html": [
-     "534df68083924ab630c3c5560f877be0a40a960a",
+     "da86f23017a297470a548f386178d06001b4c543",
      [
       null,
       {
@@ -812919,6 +816110,13 @@
       null,
       {}
      ]
+    ],
+    "transfer-datachannel.html": [
+     "89fa50a3463593eb17943ec77420c434ec0ff7d7",
+     [
+      null,
+      {}
+     ]
     ]
    },
    "webrtc-encoded-transform": {
@@ -813231,7 +816429,7 @@
      ]
     ],
     "RTCRtpEncodingParameters-scaleResolutionDownTo.https.html": [
-     "01205b889bb68ec64fc9f97a2c26d01e00ac70ff",
+     "ae334836d0e3fe50b4413334c9c2d07025ac6f0f",
      [
       null,
       {
@@ -813277,13 +816475,6 @@
       null,
       {}
      ]
-    ],
-    "transfer-datachannel.html": [
-     "9759a67a24463d874a4bbf426b06d38adba114b4",
-     [
-      null,
-      {}
-     ]
     ]
    },
    "webrtc-ice": {
@@ -854903,108 +858094,6 @@
        null,
        {}
       ]
-     ],
-     "flexbox": {
-      "image-in-fragmented-flexbox-crash-001.html": [
-       "3c8a6c52944da437e1d8a0b5e6cf35b766f2c1c0",
-       [
-        null,
-        {}
-       ]
-      ],
-      "image-in-fragmented-flexbox-crash-002.html": [
-       "a63c5be6c3e8910bc5bddb52e99bab54bfd1b385",
-       [
-        null,
-        {}
-       ]
-      ]
-     },
-     "grid": {
-      "grid-item-placement-crash-multiple.html": [
-       "6ce9d39ef628105dfa5cf735e6608196f5e57a69",
-       [
-        null,
-        {}
-       ]
-      ]
-     },
-     "nested-fixedpos-in-inline-crash-000.html": [
-      "8d1d395e35c8a40faf07d688e6e51d34bc35e88f",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-fixedpos-in-inline-crash-001.html": [
-      "dc4e8fba67f2c5a801b529747def70946d723ede",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-fixedpos-in-inline-crash-002.html": [
-      "15a5a9633264d15709acdc48948c2d69c2c3cc31",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-001.html": [
-      "88b902af50283f87439e73fde9564cbb2bcba73a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-002.html": [
-      "3a5b1da331116e86a6d16aaf8341cc5bf6a075aa",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-003.html": [
-      "e6c1293e3b76488d9bd48fa8234ce4e78737be66",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-004.html": [
-      "5db9163398a7fcbcf1ec76b69471d83891ece3bf",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-005.html": [
-      "f7b56c1c985f43dca8b8849d78a8bba95f7a7b94",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-006.html": [
-      "b969f925d3fa132a332fca462917f1f893973f05",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-007.html": [
-      "861aac2bc3dd0e2af03372ac8b0b031f2501f93a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "nested-multicol-with-spanner-and-oof-crash-008.html": [
-      "a8d0f3e77ea62d9976a5e1606e74cd0602a38b02",
-      [
-       null,
-       {}
-      ]
      ]
     },
     "css-contain": {
@@ -856553,6 +859642,15 @@
      ]
     },
     "css-view-transitions": {
+     "layered-capture": {
+      "tree-effects-ref.sub.html": [
+       "e068b2918f1e8300e6c97c17a6ae2330ce1fbc81",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "shared-transition-author-style.manual.html": [
       "d757c8cf0dc3972e360c9e91b2ea900b97a16b47",
       [
@@ -858812,7 +861910,7 @@
          ]
         ],
         "viewport.py": [
-         "e9ff8517f264a84918b90cd7e102a432eeedcdb9",
+         "15e3dd5688f769818fe8824415030672e036deb3",
          [
           null,
           {}
@@ -858821,7 +861919,7 @@
        },
        "traverse_history": {
         "context.py": [
-         "2635dcfa287218dc1afabeea5c8186d3a1ee4109",
+         "d603f462b7933c8fc0ca50aabc6ffe92d06135fd",
          [
           null,
           {}
@@ -858835,7 +861933,7 @@
          ]
         ],
         "invalid.py": [
-         "c6a90601e70da8af00723daa2924914969c5cea5",
+         "ddbe179fabd835c6bd21a8ae68be015af32a8dde",
          [
           null,
           {}
@@ -858965,7 +862063,7 @@
          ]
         ],
         "pointer_mouse.py": [
-         "7077d7bba4678b8825cbe83556f18b4b6db1e0ea",
+         "87d204f0b1e1a4bcfc10d659a7a2a7010988cd15",
          [
           null,
           {}
@@ -859207,7 +862305,7 @@
        },
        "auth_required": {
         "auth_required.py": [
-         "8ae539056429b4651cee0fcab4d6dce639a9a8c5",
+         "a23821f2ae73c1f80de9c957e8e55e5c788930df",
          [
           null,
           {}
@@ -859223,7 +862321,7 @@
        },
        "before_request_sent": {
         "before_request_sent.py": [
-         "f8d1f7ba786bef57da02badc7b3506c1505b0408",
+         "be2634fc6a90c834864272a251a86499168d0bf0",
          [
           null,
           {}
@@ -859379,7 +862477,7 @@
        },
        "fetch_error": {
         "fetch_error.py": [
-         "de6567100a96a4a5303f2ea4e7ec1f576ee8fddb",
+         "aa2caa37702c63d80592d39dd6015084dfcb3289",
          [
           null,
           {}
@@ -859459,7 +862557,7 @@
        },
        "response_completed": {
         "response_completed.py": [
-         "ba916390ea2ed382197df3d351d8b1bce0074d74",
+         "a6f8fb20aa1864e14c23313c9b677cc390bbc955",
          [
           null,
           {}
@@ -859475,7 +862573,7 @@
        },
        "response_started": {
         "response_started.py": [
-         "d2d987d8e4aa61c95d94bb30f935b22b6f43f977",
+         "310e91d57da05bd191bdba01de3f2c42cd1e0ec2",
          [
           null,
           {}
@@ -861358,7 +864456,7 @@
         ]
        ],
        "pointer_mouse.py": [
-        "f8683ce45156c7d79c49753eca04c55ffc2b4f16",
+        "9686cd0a1e87913a48a92fd2d041c99f654d8c2c",
         [
          null,
          {}
diff --git a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
similarity index 54%
rename from tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini
rename to tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
index 5e414c7aa15..4bbbd377ec9 100644
--- a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js.ini
@@ -1,4 +1,4 @@
-[cfrg_curves_bits.https.any.html]
+[cfrg_curves_bits_curve25519.https.any.html]
   [setup - define tests]
     expected: FAIL
 
@@ -20,23 +20,8 @@
   [X25519 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 key derivation checks for all-zero value result with a key of order 0]
-    expected: FAIL
 
-  [X448 key derivation checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
-
-
-[cfrg_curves_bits.https.any.worker.html]
+[cfrg_curves_bits_curve25519.https.any.worker.html]
   [setup - define tests]
     expected: FAIL
 
@@ -57,18 +42,3 @@
 
   [X25519 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
new file mode 100644
index 00000000000..888b38f430c
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js.ini
@@ -0,0 +1,38 @@
+[cfrg_curves_bits_curve448.https.any.worker.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+
+[cfrg_curves_bits_curve448.https.any.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 key derivation checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
similarity index 54%
rename from tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini
rename to tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
index 68fe4aef6c2..3ceecca494b 100644
--- a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js.ini
@@ -1,13 +1,7 @@
-[cfrg_curves_keys.https.any.worker.html]
+[cfrg_curves_keys_curve25519.https.any.worker.html]
   [setup - define tests]
     expected: FAIL
 
-  [Key derivation using a X25519 generated keys.]
-    expected: FAIL
-
-  [Key derivation using a X448 generated keys.]
-    expected: FAIL
-
   [X25519 deriveBits checks for all-zero value result with a key of order 0]
     expected: FAIL
 
@@ -26,30 +20,12 @@
   [X25519 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 deriveBits checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
-    expected: FAIL
-
-
-[cfrg_curves_keys.https.any.html]
-  [setup - define tests]
-    expected: FAIL
-
   [Key derivation using a X25519 generated keys.]
     expected: FAIL
 
-  [Key derivation using a X448 generated keys.]
+
+[cfrg_curves_keys_curve25519.https.any.html]
+  [setup - define tests]
     expected: FAIL
 
   [X25519 deriveBits checks for all-zero value result with a key of order 0]
@@ -70,17 +46,5 @@
   [X25519 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
     expected: FAIL
 
-  [X448 deriveBits checks for all-zero value result with a key of order 0]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order 1]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
-    expected: FAIL
-
-  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+  [Key derivation using a X25519 generated keys.]
     expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
new file mode 100644
index 00000000000..1dae45b89c9
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js.ini
@@ -0,0 +1,44 @@
+[cfrg_curves_keys_curve448.https.any.worker.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+  [Key derivation using a X448 generated keys.]
+    expected: FAIL
+
+
+[cfrg_curves_keys_curve448.https.any.html]
+  [setup - define tests]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 0]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order 1]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p-1 (order 2)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p (=0, order 4)]
+    expected: FAIL
+
+  [X448 deriveBits checks for all-zero value result with a key of order p+1 (=1, order 1)]
+    expected: FAIL
+
+  [Key derivation using a X448 generated keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
deleted file mode 100644
index 381ee699ecc..00000000000
--- a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
+++ /dev/null
@@ -1,698 +0,0 @@
-[okp_importKey.https.any.worker.html]
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-
-[okp_importKey.https.any.html]
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
-    expected: FAIL
-
-  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
-    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
new file mode 100644
index 00000000000..6615fe1a314
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js.ini
@@ -0,0 +1,188 @@
+[okp_importKey_Ed25519.https.any.html]
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+
+[okp_importKey_Ed25519.https.any.worker.html]
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed25519 (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
new file mode 100644
index 00000000000..558ee948191
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js.ini
@@ -0,0 +1,188 @@
+[okp_importKey_Ed448.https.any.html]
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+
+[okp_importKey_Ed448.https.any.worker.html]
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: Ed448 (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
new file mode 100644
index 00000000000..809f315a565
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js.ini
@@ -0,0 +1,164 @@
+[okp_importKey_X25519.https.any.worker.html]
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+
+[okp_importKey_X25519.https.any.html]
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(kty, crv, x), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X25519 (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (spki, buffer(44), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(kty, crv, x), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (raw, buffer(32), {name: X25519}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
new file mode 100644
index 00000000000..327e034f189
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js.ini
@@ -0,0 +1,164 @@
+[okp_importKey_X448.https.any.html]
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+
+[okp_importKey_X448.https.any.worker.html]
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(kty, crv, x), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters with ignored JWK alg: X448 (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (spki, buffer(68), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(kty, crv, x), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
deleted file mode 100644
index 1d48180b27e..00000000000
--- a/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa.https.any.js.ini
+++ /dev/null
@@ -1,242 +0,0 @@
-[eddsa.https.any.html]
-  [EdDSA Ed25519 verification]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed25519 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed25519 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed25519 round trip]
-    expected: FAIL
-
-  [EdDSA Ed25519 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed25519 keys.]
-    expected: FAIL
-
-  [EdDSA Ed448 verification]
-    expected: FAIL
-
-  [EdDSA Ed448 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed448 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed448 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed448 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed448 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed448 round trip]
-    expected: FAIL
-
-  [EdDSA Ed448 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed448 keys.]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 0]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 1]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 2]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 3]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 4]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 5]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 6]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 7]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 8]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 9]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 10]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 11]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 12]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 13]
-    expected: FAIL
-
-
-[eddsa.https.any.worker.html]
-  [EdDSA Ed25519 verification]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed25519 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed25519 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed25519 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed25519 round trip]
-    expected: FAIL
-
-  [EdDSA Ed25519 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed25519 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed25519 keys.]
-    expected: FAIL
-
-  [EdDSA Ed448 verification]
-    expected: FAIL
-
-  [EdDSA Ed448 verification with altered signature after call]
-    expected: FAIL
-
-  [EdDSA Ed448 with altered data after call]
-    expected: FAIL
-
-  [EdDSA Ed448 using privateKey to verify]
-    expected: FAIL
-
-  [EdDSA Ed448 using publicKey to sign]
-    expected: FAIL
-
-  [EdDSA Ed448 no verify usage]
-    expected: FAIL
-
-  [EdDSA Ed448 round trip]
-    expected: FAIL
-
-  [EdDSA Ed448 signing with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verifying with wrong algorithm name]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to shortened signature]
-    expected: FAIL
-
-  [EdDSA Ed448 verification failure due to altered data]
-    expected: FAIL
-
-  [Sign and verify using generated Ed448 keys.]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 0]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 1]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 2]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 3]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 4]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 5]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 6]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 7]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 8]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 9]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 10]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 11]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 12]
-    expected: FAIL
-
-  [Ed25519 Verification checks with small-order key of order - Test 13]
-    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
new file mode 100644
index 00000000000..90b1c125ddc
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js.ini
@@ -0,0 +1,80 @@
+[eddsa_curve25519.https.any.html]
+  [EdDSA Ed25519 verification]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed25519 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed25519 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed25519 round trip]
+    expected: FAIL
+
+  [EdDSA Ed25519 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed25519 keys.]
+    expected: FAIL
+
+
+[eddsa_curve25519.https.any.worker.html]
+  [EdDSA Ed25519 verification]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed25519 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed25519 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed25519 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed25519 round trip]
+    expected: FAIL
+
+  [EdDSA Ed25519 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed25519 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed25519 keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
new file mode 100644
index 00000000000..82b91e93175
--- /dev/null
+++ b/tests/wpt/meta/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js.ini
@@ -0,0 +1,80 @@
+[eddsa_curve448.https.any.worker.html]
+  [EdDSA Ed448 verification]
+    expected: FAIL
+
+  [EdDSA Ed448 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed448 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed448 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed448 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed448 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed448 round trip]
+    expected: FAIL
+
+  [EdDSA Ed448 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed448 keys.]
+    expected: FAIL
+
+
+[eddsa_curve448.https.any.html]
+  [EdDSA Ed448 verification]
+    expected: FAIL
+
+  [EdDSA Ed448 verification with altered signature after call]
+    expected: FAIL
+
+  [EdDSA Ed448 with altered data after call]
+    expected: FAIL
+
+  [EdDSA Ed448 using privateKey to verify]
+    expected: FAIL
+
+  [EdDSA Ed448 using publicKey to sign]
+    expected: FAIL
+
+  [EdDSA Ed448 no verify usage]
+    expected: FAIL
+
+  [EdDSA Ed448 round trip]
+    expected: FAIL
+
+  [EdDSA Ed448 signing with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verifying with wrong algorithm name]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to shortened signature]
+    expected: FAIL
+
+  [EdDSA Ed448 verification failure due to altered data]
+    expected: FAIL
+
+  [Sign and verify using generated Ed448 keys.]
+    expected: FAIL
diff --git a/tests/wpt/meta/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini b/tests/wpt/meta/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
new file mode 100644
index 00000000000..0ce7184e0ff
--- /dev/null
+++ b/tests/wpt/meta/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-cookies-a-b-a-embed.tentative.https.html]
+  [Same-site embed with a cross-site parent partitioned cookie access]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
new file mode 100644
index 00000000000..3821701e831
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-property.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-property.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
new file mode 100644
index 00000000000..f251fd61978
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-timing-function-reverse.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
new file mode 100644
index 00000000000..fa7deb78c2f
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html.ini
@@ -0,0 +1,2 @@
+[background-color-animation-custom-timing-function.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-cascade/scope-shadow.tentative.html.ini b/tests/wpt/meta/css/css-cascade/scope-shadow.html.ini
similarity index 92%
rename from tests/wpt/meta/css/css-cascade/scope-shadow.tentative.html.ini
rename to tests/wpt/meta/css/css-cascade/scope-shadow.html.ini
index bf47d2b4f77..45532a6b577 100644
--- a/tests/wpt/meta/css/css-cascade/scope-shadow.tentative.html.ini
+++ b/tests/wpt/meta/css/css-cascade/scope-shadow.html.ini
@@ -1,4 +1,4 @@
-[scope-shadow.tentative.html]
+[scope-shadow.html]
   [@scope can match :host]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
new file mode 100644
index 00000000000..ac5cb8ba7db
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-visited-getcomputedstyle.html.ini
@@ -0,0 +1,3 @@
+[relative-currentcolor-visited-getcomputedstyle.html]
+  [Property background-color value 'rgb(from currentcolor r g b)' should not leak :visited for computed style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
new file mode 100644
index 00000000000..72f4601118a
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-parsing.html.ini
@@ -0,0 +1,2 @@
+[at-container-overflowing-parsing.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
new file mode 100644
index 00000000000..18c1abafcc7
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/at-container-overflowing-serialization.html.ini
@@ -0,0 +1,2 @@
+[at-container-overflowing-serialization.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
new file mode 100644
index 00000000000..e5d314021fb
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state-snapped-none.html.ini
@@ -0,0 +1,2 @@
+[scroll-state-snapped-none.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-flexbox/negative-overflow-003.html.ini b/tests/wpt/meta/css/css-flexbox/negative-overflow-003.html.ini
new file mode 100644
index 00000000000..279e4cd62c3
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/negative-overflow-003.html.ini
@@ -0,0 +1,144 @@
+[negative-overflow-003.html]
+  [.container 1]
+    expected: FAIL
+
+  [.container 2]
+    expected: FAIL
+
+  [.container 3]
+    expected: FAIL
+
+  [.container 4]
+    expected: FAIL
+
+  [.container 5]
+    expected: FAIL
+
+  [.container 6]
+    expected: FAIL
+
+  [.container 7]
+    expected: FAIL
+
+  [.container 8]
+    expected: FAIL
+
+  [.container 9]
+    expected: FAIL
+
+  [.container 10]
+    expected: FAIL
+
+  [.container 11]
+    expected: FAIL
+
+  [.container 12]
+    expected: FAIL
+
+  [.container 13]
+    expected: FAIL
+
+  [.container 14]
+    expected: FAIL
+
+  [.container 15]
+    expected: FAIL
+
+  [.container 16]
+    expected: FAIL
+
+  [.container 17]
+    expected: FAIL
+
+  [.container 18]
+    expected: FAIL
+
+  [.container 19]
+    expected: FAIL
+
+  [.container 20]
+    expected: FAIL
+
+  [.container 21]
+    expected: FAIL
+
+  [.container 22]
+    expected: FAIL
+
+  [.container 23]
+    expected: FAIL
+
+  [.container 24]
+    expected: FAIL
+
+  [.container 25]
+    expected: FAIL
+
+  [.container 26]
+    expected: FAIL
+
+  [.container 27]
+    expected: FAIL
+
+  [.container 28]
+    expected: FAIL
+
+  [.container 29]
+    expected: FAIL
+
+  [.container 30]
+    expected: FAIL
+
+  [.container 31]
+    expected: FAIL
+
+  [.container 32]
+    expected: FAIL
+
+  [.container 33]
+    expected: FAIL
+
+  [.container 34]
+    expected: FAIL
+
+  [.container 35]
+    expected: FAIL
+
+  [.container 36]
+    expected: FAIL
+
+  [.container 37]
+    expected: FAIL
+
+  [.container 38]
+    expected: FAIL
+
+  [.container 39]
+    expected: FAIL
+
+  [.container 40]
+    expected: FAIL
+
+  [.container 41]
+    expected: FAIL
+
+  [.container 42]
+    expected: FAIL
+
+  [.container 43]
+    expected: FAIL
+
+  [.container 44]
+    expected: FAIL
+
+  [.container 45]
+    expected: FAIL
+
+  [.container 46]
+    expected: FAIL
+
+  [.container 47]
+    expected: FAIL
+
+  [.container 48]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/incremental-scroll.html.ini b/tests/wpt/meta/css/css-overflow/incremental-scroll.html.ini
deleted file mode 100644
index 9229fc5a886..00000000000
--- a/tests/wpt/meta/css/css-overflow/incremental-scroll.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[incremental-scroll.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
new file mode 100644
index 00000000000..17ee387fe0b
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-035.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
new file mode 100644
index 00000000000..d1cf1a87612
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-036.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
new file mode 100644
index 00000000000..eb0cd26bcdc
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-037.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini
new file mode 100644
index 00000000000..7b6ee53191e
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini
new file mode 100644
index 00000000000..873156dc23c
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-023.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text-decor/inheritance.html.ini b/tests/wpt/meta/css/css-text-decor/inheritance.html.ini
index 58566e30618..d960be1f4df 100644
--- a/tests/wpt/meta/css/css-text-decor/inheritance.html.ini
+++ b/tests/wpt/meta/css/css-text-decor/inheritance.html.ini
@@ -31,3 +31,6 @@
 
   [Property text-emphasis-position has initial value over]
     expected: FAIL
+
+  [Property text-emphasis-position has initial value auto]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini b/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
index ed48097c3d9..84fa28b920b 100644
--- a/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
+++ b/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-computed.html.ini
@@ -16,3 +16,6 @@
 
   [Property text-emphasis-position value 'under left']
     expected: FAIL
+
+  [Property text-emphasis-position value 'auto']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini b/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
new file mode 100644
index 00000000000..6816048b7a8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text-decor/parsing/text-emphasis-position-valid.html.ini
@@ -0,0 +1,15 @@
+[text-emphasis-position-valid.html]
+  [e.style['text-emphasis-position'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "over left" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "right under" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "over" should set the property value]
+    expected: FAIL
+
+  [e.style['text-emphasis-position'\] = "under" should set the property value]
+    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
deleted file mode 100644
index 443c26a161b..00000000000
--- a/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[MediaQueryList-extends-EventTarget-interop.html]
-  [capturing event listener fires before non-capturing listener at target]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
index 0c0c3903bbf..abb2630bae2 100644
--- a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
+++ b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
@@ -53,6 +53,54 @@
   [from(): Throws 'callable' error when @@iterator property is a non-callable primitive]
     expected: FAIL
 
+  [from(): Async iterable protocol null, converts as iterator]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion]
+    expected: FAIL
+
+  [from(): Asynchronous iterable multiple in-flight subscriptions competing]
+    expected: FAIL
+
+  [from(): Asynchronous generator conversion: can only be used once]
+    expected: FAIL
+
+  [from(): Promise-wrapping semantics of IteratorResult interface]
+    expected: FAIL
+
+  [from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() GETTER are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Aborting sync iterable midway through iteration both stops iteration and invokes `IteratorRecord#return()]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion, with synchronous iterable fallback]
+    expected: FAIL
+
+  [from(): Generator finally block runs when subscription is aborted]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable completes]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable errors]
+    expected: FAIL
+
+  [from(): Async generator finally block run when subscription is aborted]
+    expected: FAIL
+
+  [from(): Async generator finally block runs when Observable completes]
+    expected: FAIL
+
+  [from(): Async generator finally block run when Observable errors]
+    expected: FAIL
+
 
 [observable-from.any.html]
   [from(): Observable.from() is a function]
@@ -108,3 +156,51 @@
 
   [from(): Throws 'callable' error when @@iterator property is a non-callable primitive]
     expected: FAIL
+
+  [from(): Async iterable protocol null, converts as iterator]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion]
+    expected: FAIL
+
+  [from(): Asynchronous iterable multiple in-flight subscriptions competing]
+    expected: FAIL
+
+  [from(): Asynchronous generator conversion: can only be used once]
+    expected: FAIL
+
+  [from(): Promise-wrapping semantics of IteratorResult interface]
+    expected: FAIL
+
+  [from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() GETTER are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Errors thrown in async iterator's next() are propagated in a microtask]
+    expected: FAIL
+
+  [from(): Aborting sync iterable midway through iteration both stops iteration and invokes `IteratorRecord#return()]
+    expected: FAIL
+
+  [from(): Asynchronous iterable conversion, with synchronous iterable fallback]
+    expected: FAIL
+
+  [from(): Generator finally block runs when subscription is aborted]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable completes]
+    expected: FAIL
+
+  [from(): Generator finally block run when Observable errors]
+    expected: FAIL
+
+  [from(): Async generator finally block run when subscription is aborted]
+    expected: FAIL
+
+  [from(): Async generator finally block runs when Observable completes]
+    expected: FAIL
+
+  [from(): Async generator finally block run when Observable errors]
+    expected: FAIL
diff --git a/tests/wpt/meta/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini b/tests/wpt/meta/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
index 22fa459058a..bf79f0682fd 100644
--- a/tests/wpt/meta/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
+++ b/tests/wpt/meta/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js.ini
@@ -56,60 +56,6 @@
   [gb18030 decoder: GB18030-2022 18]
     expected: FAIL
 
-  [gb18030 decoder: GB18030-2022 19]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 20]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 21]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 22]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 23]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 24]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 25]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 26]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 27]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 28]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 29]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 30]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 31]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 32]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 33]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 34]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 35]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 36]
-    expected: FAIL
-
 
 [gb18030-decoder.any.html]
   [gb18030 decoder: two bytes 0xFE 0xFF]
@@ -168,57 +114,3 @@
 
   [gb18030 decoder: GB18030-2022 18]
     expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 19]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 20]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 21]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 22]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 23]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 24]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 25]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 26]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 27]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 28]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 29]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 30]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 31]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 32]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 33]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 34]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 35]
-    expected: FAIL
-
-  [gb18030 decoder: GB18030-2022 36]
-    expected: FAIL
diff --git a/tests/wpt/meta/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini b/tests/wpt/meta/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
index a758fbca55f..3eb82d3ee0c 100644
--- a/tests/wpt/meta/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
+++ b/tests/wpt/meta/encoding/legacy-mb-schinese/gbk/gbk-encoder.html.ini
@@ -32,3 +32,113 @@
   [gbk encoder: legacy WebKit case 1]
     expected: FAIL
 
+  [gbk encoder: U+10FFFF]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 1]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 2]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 3]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 4]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 5]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 6]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 7]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 8]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 9]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 10]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 11]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 12]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 13]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 14]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 15]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 16]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 17]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 18]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 19]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 20]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 21]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 22]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 23]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 24]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 25]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 26]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 27]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 28]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 29]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 30]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 31]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 32]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 33]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 34]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 35]
+    expected: FAIL
+
+  [gbk encoder: GB18030-2022 36]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
index 74a99072845..2a3701b5bd0 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
@@ -1,5 +1,5 @@
 [createImageBitmap-invalid-args.html]
-  expected: ERROR
+  expected: TIMEOUT
   [createImageBitmap with a vector HTMLImageElement source and sw set to 0]
     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..68203d2a082 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
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index a6591b318dc..4034793cc72 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 653c5e98f2f..d5fd800f09d 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html.ini
rename to tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html.ini
rename to tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
similarity index 54%
rename from tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini
rename to tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
index 25e22c079b7..3a5e9a3d9dc 100644
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html.ini
@@ -1,13 +1,4 @@
 [select-datalist-options-idl.tentative.html]
-  [Option elements should work if they are a descendant of a selects datalist.]
-    expected: FAIL
-
-  [Options in datalist should still work when the multiple attribute is added.]
-    expected: FAIL
-
-  [Options in datalist in multiple should work after re-parsing and re-attaching.]
-    expected: FAIL
-
   [Option elements should work if they are a descendant of a selects wrapper div.]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
similarity index 76%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini
rename to tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
index 85465f58574..19b3d41fe42 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
@@ -1,5 +1,5 @@
 [select-parsing.tentative.html]
-  [<button>s and <datalist>s should be allowed in <select>.]
+  [<div>s, <button>s, and <datalist>s should be allowed in <select>.]
     expected: FAIL
 
   [</select> should close <button>.]
@@ -14,11 +14,5 @@
   [<select> in <select><button><div> should remove inner <select>.]
     expected: FAIL
 
-  [Nested <button>s or <datalist>s in <select> should be dropped.]
-    expected: FAIL
-
-  [<div>s, <button>s, and <datalist>s should be allowed in <select>.]
-    expected: FAIL
-
   [Divs and imgs should be allowed as direct children of select and within options without a datalist.]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html.ini
similarity index 100%
rename from tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html.ini
rename to tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html.ini
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
deleted file mode 100644
index 64bbc4eb303..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-rendering.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
index 6a781a5e0af..7c105d8afdb 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
@@ -490,3 +490,39 @@
 
   [onbeforetoggle: the content attribute must be compiled into a function as the corresponding property]
     expected: FAIL
+
+  [onauxclick: dispatching an Event at a <meta> element must trigger element.onauxclick]
+    expected: FAIL
+
+  [onbeforeinput: dispatching an Event at a <meta> element must trigger element.onbeforeinput]
+    expected: FAIL
+
+  [onbeforematch: dispatching an Event at a <meta> element must trigger element.onbeforematch]
+    expected: FAIL
+
+  [onbeforetoggle: dispatching an Event at a <meta> element must trigger element.onbeforetoggle]
+    expected: FAIL
+
+  [oncontextlost: dispatching an Event at a <meta> element must trigger element.oncontextlost]
+    expected: FAIL
+
+  [oncontextrestored: dispatching an Event at a <meta> element must trigger element.oncontextrestored]
+    expected: FAIL
+
+  [onscrollend: dispatching an Event at a <meta> element must trigger element.onscrollend]
+    expected: FAIL
+
+  [onslotchange: dispatching an Event at a <meta> element must trigger element.onslotchange]
+    expected: FAIL
+
+  [onwebkitanimationend: dispatching an Event at a <meta> element must trigger element.onwebkitanimationend]
+    expected: FAIL
+
+  [onwebkitanimationiteration: dispatching an Event at a <meta> element must trigger element.onwebkitanimationiteration]
+    expected: FAIL
+
+  [onwebkitanimationstart: dispatching an Event at a <meta> element must trigger element.onwebkitanimationstart]
+    expected: FAIL
+
+  [onwebkittransitionend: dispatching an Event at a <meta> element must trigger element.onwebkittransitionend]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
index b57975c29b5..aa1a8d05bc9 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
@@ -160,3 +160,120 @@
 
   [shadowed pageswap removal (window)]
     expected: FAIL
+
+  [shadowed blur on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed messageerror on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagereveal on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageswap on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed rejectionhandled on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed focus removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed load removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed resize removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed scroll removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed afterprint removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed beforeprint removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed beforeunload removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed hashchange removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed languagechange removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed message removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed offline removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed online removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed pagehide removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed pageshow removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed popstate removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed storage removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed unload removal (document.createElement("body"))]
+    expected: FAIL
+
+  [shadowed focus removal (window)]
+    expected: FAIL
+
+  [shadowed load removal (window)]
+    expected: FAIL
+
+  [shadowed resize removal (window)]
+    expected: FAIL
+
+  [shadowed scroll removal (window)]
+    expected: FAIL
+
+  [shadowed afterprint removal (window)]
+    expected: FAIL
+
+  [shadowed beforeprint removal (window)]
+    expected: FAIL
+
+  [shadowed beforeunload removal (window)]
+    expected: FAIL
+
+  [shadowed hashchange removal (window)]
+    expected: FAIL
+
+  [shadowed languagechange removal (window)]
+    expected: FAIL
+
+  [shadowed message removal (window)]
+    expected: FAIL
+
+  [shadowed offline removal (window)]
+    expected: FAIL
+
+  [shadowed online removal (window)]
+    expected: FAIL
+
+  [shadowed pagehide removal (window)]
+    expected: FAIL
+
+  [shadowed pageshow removal (window)]
+    expected: FAIL
+
+  [shadowed popstate removal (window)]
+    expected: FAIL
+
+  [shadowed storage removal (window)]
+    expected: FAIL
+
+  [shadowed unload removal (window)]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
index d5f481a86a8..bd1d7c79e1a 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
@@ -160,3 +160,69 @@
 
   [shadowed pageswap removal (window)]
     expected: FAIL
+
+  [shadowed blur on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed focus on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed load on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed resize on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed scroll on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed afterprint on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed beforeprint on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed beforeunload on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed hashchange on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed languagechange on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed message on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed messageerror on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed offline on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed online on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagehide on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pagereveal on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageshow on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed pageswap on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed popstate on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed rejectionhandled on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed storage on body fires when event dispatched on window]
+    expected: FAIL
+
+  [shadowed unload on body fires when event dispatched on window]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/update-rendering/child-document-raf-order.html.ini b/tests/wpt/meta/html/webappapis/update-rendering/child-document-raf-order.html.ini
new file mode 100644
index 00000000000..312c6689170
--- /dev/null
+++ b/tests/wpt/meta/html/webappapis/update-rendering/child-document-raf-order.html.ini
@@ -0,0 +1,3 @@
+[child-document-raf-order.html]
+  [Ordering of steps in "Update the Rendering" - child document requestAnimationFrame order]
+    expected: FAIL
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 256cf4b2cca..00000000000
--- a/tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[nested-context-navigations-iframe.html]
-  expected: TIMEOUT
-  [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
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/.github/workflows/check-workflow-run.yml b/tests/wpt/tests/.github/workflows/check-workflow-run.yml
index 87670651d98..4b7e6575db6 100644
--- a/tests/wpt/tests/.github/workflows/check-workflow-run.yml
+++ b/tests/wpt/tests/.github/workflows/check-workflow-run.yml
@@ -21,7 +21,7 @@ jobs:
     permissions:
       actions: read
     outputs:
-      output: ${{ steps.check.outputs.test }}
+      output: ${{ steps.check.outputs.updated-refs }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -32,12 +32,24 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: git-push-output
-          path: ${{ runner.temp }}/git-push-output.txt
+          path: ${{ runner.temp }}/git-push-output
           run-id: ${{ github.event.workflow_run.id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - id: check
-        run: |-
-          python3 tools/ci/check_for_updated_refs.py >> "$GITHUB_OUTPUT"
+        run: |
+          {
+              echo 'updated-refs<<EOF'
+              python3 tools/ci/check_for_updated_refs.py
+              echo EOF
+          } >> "$GITHUB_OUTPUT"
         env:
-          GIT_PUSH_OUTPUT: ${{ runner.temp }}/git-push-output.txt
+          GIT_PUSH_OUTPUT: ${{ runner.temp }}/git-push-output/git-push-output.txt
           REFS: ${{ inputs.check-refs }}
+
+  check-workflow-run-noop:
+    name: "Check for appropriate epochs (noop)"
+    if: ${{ github.event_name != 'workflow_run' }}
+    runs-on:
+      - ubuntu-22.04
+    steps:
+      - run: exit 0
diff --git a/tests/wpt/tests/.github/workflows/safari_stable.yml b/tests/wpt/tests/.github/workflows/safari_stable.yml
index 88f1e72ecc2..0df13f43d44 100644
--- a/tests/wpt/tests/.github/workflows/safari_stable.yml
+++ b/tests/wpt/tests/.github/workflows/safari_stable.yml
@@ -33,13 +33,8 @@ jobs:
   safari-stable-results:
     name: "All Tests: Safari (stable)"
     needs: check-workflow-run
-    # We need always() here to then check for success/skipped from the
-    # dependency, as otherwise the skip cascades. See
-    # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/using-jobs-in-a-workflow#defining-prerequisite-jobs.
     if: |
-      always() &&
-      (needs.check-workflow-run.result == 'success' || needs.check-workflow-run.result == 'skipped') &&
-      (github.event_name != 'workflow_run' || fromJSON(needs.check-workflow-run.outputs.updated-refs)[0] != null)
+      github.event_name != 'workflow_run' || fromJSON(needs.check-workflow-run.outputs.updated-refs)[0] != null
     runs-on:
       - self-hosted
       - webkit-ews
diff --git a/tests/wpt/tests/.github/workflows/safari_technology_preview.yml b/tests/wpt/tests/.github/workflows/safari_technology_preview.yml
index 7c02951813b..01380aa718e 100644
--- a/tests/wpt/tests/.github/workflows/safari_technology_preview.yml
+++ b/tests/wpt/tests/.github/workflows/safari_technology_preview.yml
@@ -33,13 +33,8 @@ jobs:
   safari-technology-preview-results:
     name: "All Tests: Safari Technology Preview"
     needs: check-workflow-run
-    # We need always() here to then check for success/skipped from the
-    # dependency, as otherwise the skip cascades. See
-    # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/using-jobs-in-a-workflow#defining-prerequisite-jobs.
     if: |
-      always() &&
-      (needs.check-workflow-run.result == 'success' || needs.check-workflow-run.result == 'skipped') &&
-      (github.event_name != 'workflow_run' || fromJSON(needs.check-workflow-run.outputs.updated-refs)[0] != null)
+      github.event_name != 'workflow_run' || fromJSON(needs.check-workflow-run.outputs.updated-refs)[0] != null
     runs-on:
       - self-hosted
       - webkit-ews
diff --git a/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html b/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
index cdfa145a838..80d3f6818b4 100644
--- a/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
+++ b/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
@@ -99,8 +99,8 @@ promise_test(t => {
       // Attempt to open blob URL in cross partition iframe.
       await send(cross_site_iframe_uuid, does_blob_url_open_return_handle(blob_url, response_queue_uuid));
       const response_1 = await receive(response_queue_uuid);
-      if (response_1 !== navigation_handle_not_null) {
-        reject(`Blob URL wasn't opened in not-same-top-level-site iframe: ${response_1}`);
+      if (response_1 !== navigation_handle_null) {
+        reject(`Blob URL handle wasn't null in not-same-top-level-site iframe: ${response_1}`);
       }
       const noopener_response_1 = await receive(noopener_response_queue);
       if (noopener_response_1 !== opener_null_response) {
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js
index da809278a87..8ab9db7bf71 100644
--- a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js
@@ -1,12 +1,19 @@
+function define_tests_25519() {
+    return define_tests("X25519");
+}
 
-function define_tests() {
+function define_tests_448() {
+    return define_tests("X448");
+}
+
+function define_tests(algorithmName) {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
   // Verify the derive functions perform checks against the all-zero value results,
   // ensuring small-order points are rejected.
   // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
-  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+  {
       kSmallOrderPoint[algorithmName].forEach(function(test) {
           promise_test(async() => {
               let derived;
@@ -28,15 +35,16 @@ function define_tests() {
               assert_equals(derived, undefined, "Operation succeeded, but should not have.");
           }, algorithmName + " key derivation checks for all-zero value result with a key of order " + test.order);
       });
-  });
+  }
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {
       publicKeys = results.publicKeys;
       privateKeys = results.privateKeys;
       noDeriveBitsKeys = results.noDeriveBitsKeys;
+      ecdhKeys = results.ecdhKeys;
 
-      Object.keys(sizes).forEach(function(algorithmName) {
+      {
           // Basic success case
           promise_test(function(test) {
               return subtle.deriveBits({name: algorithmName, public: publicKeys[algorithmName]}, privateKeys[algorithmName], 8 * sizes[algorithmName])
@@ -101,11 +109,7 @@ function define_tests() {
 
           // - wrong algorithm
           promise_test(function(test) {
-              publicKey = publicKeys["X25519"];
-              if (algorithmName === "X25519") {
-                  publicKey = publicKeys["X448"];
-              }
-              return subtle.deriveBits({name: algorithmName, public: publicKey}, privateKeys[algorithmName], 8 * sizes[algorithmName])
+              return subtle.deriveBits({name: algorithmName, public: ecdhKeys[algorithmName]}, privateKeys[algorithmName], 8 * sizes[algorithmName])
               .then(function(derivation) {
                   assert_unreached("deriveBits succeeded but should have failed with InvalidAccessError");
               }, function(err) {
@@ -165,16 +169,17 @@ function define_tests() {
                   assert_equals(err.name, "OperationError", "Should throw correct error, not " + err.name + ": " + err.message);
               });
           }, algorithmName + " asking for too many bits");
-      });
+      }
   });
 
   function importKeys(pkcs8, spki, sizes) {
       var privateKeys = {};
       var publicKeys = {};
       var noDeriveBitsKeys = {};
+      var ecdhPublicKeys = {};
 
       var promises = [];
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits", "deriveKey"])
@@ -184,8 +189,8 @@ function define_tests() {
                               privateKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveKey"])
@@ -195,8 +200,8 @@ function define_tests() {
                               noDeriveBitsKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(spki).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("spki", spki[algorithmName],
                                           {name: algorithmName},
                                           false, [])
@@ -206,10 +211,17 @@ function define_tests() {
                               publicKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-
+      }
+      {
+          var operation = subtle.importKey("spki", ecSPKI,
+                                           {name: "ECDH", namedCurve: "P-256"},
+                                           false, [])
+                          .then(function(key) {
+                              ecdhPublicKeys[algorithmName] = key;
+                          });
+      }
       return Promise.all(promises)
-             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveBitsKeys: noDeriveBitsKeys}});
+             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveBitsKeys: noDeriveBitsKeys, ecdhKeys: ecdhPublicKeys}});
   }
 
   // Compares two ArrayBuffer or ArrayBufferView objects. If bitCount is
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js
new file mode 100644
index 00000000000..866192e0193
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js
@@ -0,0 +1,10 @@
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
+// META: script=cfrg_curves_bits.js
+
+// Define subtests from a `promise_test` to ensure the harness does not
+// complete before the subtests are available. `explicit_done` cannot be used
+// for this purpose because the global `done` function is automatically invoked
+// by the WPT infrastructure in dedicated worker tests defined using the
+// "multi-global" pattern.
+promise_test(define_tests_25519, 'setup - define tests');
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js
similarity index 75%
rename from tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js
rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js
index c1837591ee8..32485c68107 100644
--- a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve448.https.any.js
@@ -1,4 +1,4 @@
-// META: title=WebCryptoAPI: deriveBits() Using ECDH with CFRG Elliptic Curves
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
 // META: script=cfrg_curves_bits_fixtures.js
 // META: script=cfrg_curves_bits.js
 
@@ -7,4 +7,4 @@
 // for this purpose because the global `done` function is automatically invoked
 // by the WPT infrastructure in dedicated worker tests defined using the
 // "multi-global" pattern.
-promise_test(define_tests, 'setup - define tests');
+promise_test(define_tests_448, 'setup - define tests');
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js
index ffdeb51eab9..c376c75bfe6 100644
--- a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js
@@ -35,3 +35,6 @@ var kSmallOrderPoint = {
         { order: "p+1 (=1, order 1)", vector : new Uint8Array([48, 66, 48, 5, 6, 3, 43, 101, 111, 3, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]) },
     ]
 };
+
+// "P-256":
+var ecSPKI = new Uint8Array([48, 89, 48, 19, 6, 7, 42, 134, 72, 206, 61, 2, 1, 6, 8, 42, 134, 72, 206, 61, 3, 1, 7, 3, 66, 0, 4, 154, 116, 32, 120, 126, 95, 77, 105, 211, 232, 34, 114, 115, 1, 109, 56, 224, 71, 129, 133, 223, 127, 238, 156, 142, 103, 60, 202, 211, 79, 126, 128, 254, 49, 141, 182, 221, 107, 119, 218, 99, 32, 165, 246, 151, 89, 9, 68, 23, 177, 52, 239, 138, 139, 116, 193, 101, 4, 57, 198, 115, 0, 90, 61]);
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js
index 81244ba05a8..62f9e00aa33 100644
--- a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js
@@ -1,5 +1,12 @@
+function define_tests_25519() {
+    return define_tests("X25519");
+}
 
-function define_tests() {
+function define_tests_448() {
+    return define_tests("X448");
+}
+
+function define_tests(algorithmName) {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
@@ -8,7 +15,7 @@ function define_tests() {
   // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
   // TODO: The spec states that the check must be done on use, but there is discussion about doing it on import.
   // https://github.com/WICG/webcrypto-secure-curves/pull/13
-  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+  {
       kSmallOrderPoint[algorithmName].forEach(function(test) {
           promise_test(async() => {
               let derived;
@@ -32,10 +39,10 @@ function define_tests() {
               assert_equals(derived, undefined, "Operation succeeded, but should not have.");
           }, algorithmName + " deriveBits checks for all-zero value result with a key of order " + test.order);
       });
-  });
+  }
 
   // Ensure the keys generated by each algorithm are valid for key derivation.
-  Object.keys(sizes).forEach(function(algorithmName) {
+  {
       promise_test(async() => {
           let derived;
           try {
@@ -46,15 +53,16 @@ function define_tests() {
           }
           assert_false (derived === undefined, "Key derivation failed.");
       }, "Key derivation using a " + algorithmName + " generated keys.");
-  });
+  }
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {
       publicKeys = results.publicKeys;
       privateKeys = results.privateKeys;
       noDeriveKeyKeys = results.noDeriveKeyKeys;
+      ecdhKeys = results.ecdhKeys;
 
-      Object.keys(sizes).forEach(function(algorithmName) {
+      {
           // Basic success case
           promise_test(function(test) {
               return subtle.deriveKey({name: algorithmName, public: publicKeys[algorithmName]}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
@@ -102,11 +110,7 @@ function define_tests() {
 
           // - wrong algorithm
           promise_test(function(test) {
-              publicKey = publicKeys["X25519"];
-              if (algorithmName === "X25519") {
-                  publicKey = publicKeys["X448"];
-              }
-              return subtle.deriveKey({name: algorithmName, public: publicKey}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
+              return subtle.deriveKey({name: algorithmName, public: ecdhKeys[algorithmName]}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
               .then(function(key) {return crypto.subtle.exportKey("raw", key);})
               .then(function(exportedKey) {
                   assert_unreached("deriveKey succeeded but should have failed with InvalidAccessError");
@@ -161,16 +165,17 @@ function define_tests() {
                   });
               });
           }, algorithmName + " public property value is a secret key");
-      });
+      }
   });
 
   function importKeys(pkcs8, spki, sizes) {
       var privateKeys = {};
       var publicKeys = {};
       var noDeriveKeyKeys = {};
+      var ecdhPublicKeys = {};
 
       var promises = [];
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits", "deriveKey"])
@@ -180,8 +185,8 @@ function define_tests() {
                             privateKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits"])
@@ -191,8 +196,8 @@ function define_tests() {
                             noDeriveKeyKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(spki).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("spki", spki[algorithmName],
                                           {name: algorithmName},
                                           false, [])
@@ -202,10 +207,18 @@ function define_tests() {
                             publicKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
+      }
+      {
+          var operation = subtle.importKey("spki", ecSPKI,
+                                           {name: "ECDH", namedCurve: "P-256"},
+                                           false, [])
+                          .then(function(key) {
+                              ecdhPublicKeys[algorithmName] = key;
+                          });
+      }
 
       return Promise.all(promises)
-             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveKeyKeys: noDeriveKeyKeys}});
+             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveKeyKeys: noDeriveKeyKeys, ecdhKeys: ecdhPublicKeys}});
   }
 
   // Compares two ArrayBuffer or ArrayBufferView objects. If bitCount is
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js
new file mode 100644
index 00000000000..91390ba5c2a
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js
@@ -0,0 +1,10 @@
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
+// META: script=cfrg_curves_keys.js
+
+// Define subtests from a `promise_test` to ensure the harness does not
+// complete before the subtests are available. `explicit_done` cannot be used
+// for this purpose because the global `done` function is automatically invoked
+// by the WPT infrastructure in dedicated worker tests defined using the
+// "multi-global" pattern.
+promise_test(define_tests_25519, 'setup - define tests');
diff --git a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js
similarity index 89%
rename from tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js
rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js
index 96658a56e81..b34e366376a 100644
--- a/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve448.https.any.js
@@ -7,4 +7,4 @@
 // for this purpose because the global `done` function is automatically invoked
 // by the WPT infrastructure in dedicated worker tests defined using the
 // "multi-global" pattern.
-promise_test(define_tests, 'setup - define tests');
+promise_test(define_tests_448, 'setup - define tests');
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
deleted file mode 100644
index a56bd31cbe1..00000000000
--- a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
+++ /dev/null
@@ -1,280 +0,0 @@
-// META: title=WebCryptoAPI: importKey() for OKP keys
-// META: timeout=long
-// META: script=../util/helpers.js
-
-// Test importKey and exportKey for OKP algorithms. Only "happy paths" are
-// currently tested - those where the operation should succeed.
-
-    var subtle = crypto.subtle;
-
-    var keyData = {
-        "Ed25519": {
-            spki: new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 112, 3, 33, 0, 216, 225, 137, 99, 216, 9, 212, 135, 217, 84, 154, 204, 174, 198, 116, 46, 126, 235, 162, 77, 138, 13, 59, 20, 183, 227, 202, 234, 6, 137, 61, 204]),
-            raw: new Uint8Array([216, 225, 137, 99, 216, 9, 212, 135, 217, 84, 154, 204, 174, 198, 116, 46, 126, 235, 162, 77, 138, 13, 59, 20, 183, 227, 202, 234, 6, 137, 61, 204]),
-            pkcs8: new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32, 243, 200, 244, 196, 141, 248, 120, 20, 110, 140, 211, 191, 109, 244, 229, 14, 56, 155, 167, 7, 78, 21, 194, 53, 45, 205, 93, 48, 141, 76, 168, 31]),
-            jwk: {
-                crv: "Ed25519",
-                d: "88j0xI34eBRujNO_bfTlDjibpwdOFcI1Lc1dMI1MqB8",
-                x: "2OGJY9gJ1IfZVJrMrsZ0Ln7rok2KDTsUt-PK6gaJPcw",
-                kty: "OKP"
-            }
-        },
-
-        "Ed448": {
-            spki: new Uint8Array([48, 67, 48, 5, 6, 3, 43, 101, 113, 3, 58, 0, 171, 75, 184, 133, 253, 125, 44, 90, 242, 78, 131, 113, 12, 255, 160, 199, 74, 87, 226, 116, 128, 29, 178, 5, 123, 11, 220, 94, 160, 50, 182, 254, 107, 199, 139, 128, 69, 54, 90, 235, 38, 232, 110, 31, 20, 253, 52, 157, 7, 196, 132, 149, 245, 164, 106, 90, 128]),
-            raw: new Uint8Array([171, 75, 184, 133, 253, 125, 44, 90, 242, 78, 131, 113, 12, 255, 160, 199, 74, 87, 226, 116, 128, 29, 178, 5, 123, 11, 220, 94, 160, 50, 182, 254, 107, 199, 139, 128, 69, 54, 90, 235, 38, 232, 110, 31, 20, 253, 52, 157, 7, 196, 132, 149, 245, 164, 106, 90, 128]),
-            pkcs8: new Uint8Array([48, 71, 2, 1, 0, 48, 5, 6, 3, 43, 101, 113, 4, 59, 4, 57, 14, 255, 3, 69, 140, 40, 224, 23, 156, 82, 29, 227, 18, 201, 105, 183, 131, 67, 72, 236, 171, 153, 26, 96, 227, 178, 233, 167, 158, 76, 217, 228, 128, 239, 41, 23, 18, 210, 200, 61, 4, 114, 114, 213, 201, 244, 40, 102, 79, 105, 109, 38, 112, 69, 143, 29, 46]),
-            jwk: {
-                crv: "Ed448",
-                d: "Dv8DRYwo4BecUh3jEslpt4NDSOyrmRpg47Lpp55M2eSA7ykXEtLIPQRyctXJ9ChmT2ltJnBFjx0u",
-                x: "q0u4hf19LFryToNxDP-gx0pX4nSAHbIFewvcXqAytv5rx4uARTZa6ybobh8U_TSdB8SElfWkalqA",
-                kty: "OKP"
-            }
-        },
-
-        "X25519": {
-            spki: new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 110, 3, 33, 0, 28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
-            raw: new Uint8Array([28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
-            pkcs8: new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 110, 4, 34, 4, 32, 200, 131, 142, 118, 208, 87, 223, 183, 216, 201, 90, 105, 225, 56, 22, 10, 221, 99, 115, 253, 113, 164, 210, 118, 187, 86, 227, 168, 27, 100, 255, 97]),
-            jwk: {
-                crv: "X25519",
-                d: "yIOOdtBX37fYyVpp4TgWCt1jc_1xpNJ2u1bjqBtk_2E",
-                x: "HPKx5gIuxTc3Htf1PlT6EVTYPpjrZOpR-uWzMHz-lwY",
-                kty: "OKP"
-            }
-        },
-
-        "X448": {
-            spki: new Uint8Array([48, 66, 48, 5, 6, 3, 43, 101, 111, 3, 57, 0, 182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111]),
-            raw: new Uint8Array([182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111]),
-            pkcs8: new Uint8Array([48, 70, 2, 1, 0, 48, 5, 6, 3, 43, 101, 111, 4, 58, 4, 56, 88, 199, 210, 154, 62, 181, 25, 178, 157, 0, 207, 177, 145, 187, 100, 252, 109, 138, 66, 216, 241, 113, 118, 39, 43, 137, 242, 39, 45, 24, 25, 41, 92, 101, 37, 192, 130, 150, 113, 176, 82, 239, 7, 39, 83, 15, 24, 142, 49, 208, 204, 83, 191, 38, 146, 158]),
-            jwk: {
-                crv: "X448",
-                d: "WMfSmj61GbKdAM-xkbtk_G2KQtjxcXYnK4nyJy0YGSlcZSXAgpZxsFLvBydTDxiOMdDMU78mkp4",
-                x: "tgSh0aXNHZQm1WHvYwqesWy-adW5ymFe3FNjPvtS6jHm5qCh26zG52y85kgtfkuj1V2egCdlzm8",
-                kty: "OKP"
-            }
-        },
-
-    };
-
-    // combinations to test
-    var testVectors = [
-        {name: "Ed25519", privateUsages: ["sign"], publicUsages: ["verify"]},
-        {name: "Ed448", privateUsages: ["sign"], publicUsages: ["verify"]},
-        {name: "X25519",  privateUsages: ["deriveKey", "deriveBits"], publicUsages: []},
-        {name: "X448",  privateUsages: ["deriveKey", "deriveBits"], publicUsages: []},
-    ];
-
-    // TESTS ARE HERE:
-    // Test every test vector, along with all available key data
-    testVectors.forEach(function(vector) {
-        [true, false].forEach(function(extractable) {
-
-            // Test public keys first
-            allValidUsages(vector.publicUsages, true).forEach(function(usages) {
-                ['spki', 'jwk', 'raw'].forEach(function(format) {
-                    var algorithm = {name: vector.name};
-                    var data = keyData[vector.name];
-                    if (format === "jwk") { // Not all fields used for public keys
-                        data = {jwk: {kty: keyData[vector.name].jwk.kty, crv: keyData[vector.name].jwk.crv, x: keyData[vector.name].jwk.x}};
-                    }
-
-                    testFormat(format, algorithm, data, vector.name, usages, extractable);
-
-                    // Test for https://github.com/WICG/webcrypto-secure-curves/pull/24
-                    if (format === "jwk" && extractable) {
-                        testJwkAlgBehaviours(algorithm, data.jwk, vector.name, usages);
-                    }
-                });
-
-            });
-
-            // Next, test private keys
-            allValidUsages(vector.privateUsages).forEach(function(usages) {
-                ['pkcs8', 'jwk'].forEach(function(format) {
-                    var algorithm = {name: vector.name};
-                    var data = keyData[vector.name];
-
-                    testFormat(format, algorithm, data, vector.name, usages, extractable);
-
-                    // Test for https://github.com/WICG/webcrypto-secure-curves/pull/24
-                    if (format === "jwk" && extractable) {
-                        testJwkAlgBehaviours(algorithm, data.jwk, vector.name, usages);
-                    }
-                });
-            });
-        });
-    });
-
-
-    // Test importKey with a given key format and other parameters. If
-    // extrable is true, export the key and verify that it matches the input.
-    function testFormat(format, algorithm, keyData, keySize, usages, extractable) {
-        promise_test(function(test) {
-            return subtle.importKey(format, keyData[format], algorithm, extractable, usages).
-            then(function(key) {
-                assert_equals(key.constructor, CryptoKey, "Imported a CryptoKey object");
-                assert_goodCryptoKey(key, algorithm, extractable, usages, (format === 'pkcs8' || (format === 'jwk' && keyData[format].d)) ? 'private' : 'public');
-                if (!extractable) {
-                    return;
-                }
-
-                return subtle.exportKey(format, key).
-                then(function(result) {
-                    if (format !== "jwk") {
-                        assert_true(equalBuffers(keyData[format], result), "Round trip works");
-                    } else {
-                        assert_true(equalJwk(keyData[format], result), "Round trip works");
-                    }
-                }, function(err) {
-                    assert_unreached("Threw an unexpected error: " + err.toString());
-                });
-            }, function(err) {
-                assert_unreached("Threw an unexpected error: " + err.toString());
-            });
-        }, "Good parameters: " + keySize.toString() + " bits " + parameterString(format, keyData[format], algorithm, extractable, usages));
-    }
-
-    // Test importKey/exportKey "alg" behaviours, alg is ignored upon import and alg is missing for Ed25519 and Ed448 JWK export
-    // https://github.com/WICG/webcrypto-secure-curves/pull/24
-    function testJwkAlgBehaviours(algorithm, keyData, crv, usages) {
-        promise_test(function(test) {
-            return subtle.importKey('jwk', { ...keyData, alg: 'this is ignored' }, algorithm, true, usages).
-            then(function(key) {
-                assert_equals(key.constructor, CryptoKey, "Imported a CryptoKey object");
-
-                return subtle.exportKey('jwk', key).
-                then(function(result) {
-                    assert_equals(Object.keys(result).length, keyData.d ? 6 : 5, "Correct number of JWK members");
-                    assert_equals(result.alg, undefined, 'No JWK "alg" member is present');
-                    assert_true(equalJwk(keyData, result), "Round trip works");
-                }, function(err) {
-                    assert_unreached("Threw an unexpected error: " + err.toString());
-                });
-            }, function(err) {
-                assert_unreached("Threw an unexpected error: " + err.toString());
-            });
-        }, "Good parameters with ignored JWK alg: " + crv.toString() + " " + parameterString('jwk', keyData, algorithm, true, usages));
-    }
-
-
-
-    // Helper methods follow:
-
-    // Are two array buffers the same?
-    function equalBuffers(a, b) {
-        if (a.byteLength !== b.byteLength) {
-            return false;
-        }
-
-        var aBytes = new Uint8Array(a);
-        var bBytes = new Uint8Array(b);
-
-        for (var i=0; i<a.byteLength; i++) {
-            if (aBytes[i] !== bBytes[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // Are two Jwk objects "the same"? That is, does the object returned include
-    // matching values for each property that was expected? It's okay if the
-    // returned object has extra methods; they aren't checked.
-    function equalJwk(expected, got) {
-        var fields = Object.keys(expected);
-        var fieldName;
-
-        for(var i=0; i<fields.length; i++) {
-            fieldName = fields[i];
-            if (!(fieldName in got)) {
-                return false;
-            }
-            if (expected[fieldName] !== got[fieldName]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // Build minimal Jwk objects from raw key data and algorithm specifications
-    function jwkData(keyData, algorithm) {
-        var result = {
-            kty: "oct",
-            k: byteArrayToUnpaddedBase64(keyData)
-        };
-
-        if (algorithm.name.substring(0, 3) === "AES") {
-            result.alg = "A" + (8 * keyData.byteLength).toString() + algorithm.name.substring(4);
-        } else if (algorithm.name === "HMAC") {
-            result.alg = "HS" + algorithm.hash.substring(4);
-        }
-        return result;
-    }
-
-    // Jwk format wants Base 64 without the typical padding at the end.
-    function byteArrayToUnpaddedBase64(byteArray){
-        var binaryString = "";
-        for (var i=0; i<byteArray.byteLength; i++){
-            binaryString += String.fromCharCode(byteArray[i]);
-        }
-        var base64String = btoa(binaryString);
-
-        return base64String.replace(/=/g, "");
-    }
-
-    // Convert method parameters to a string to uniquely name each test
-    function parameterString(format, data, algorithm, extractable, usages) {
-        if ("byteLength" in data) {
-            data = "buffer(" + data.byteLength.toString() + ")";
-        } else {
-            data = "object(" + Object.keys(data).join(", ") + ")";
-        }
-        var result = "(" +
-                        objectToString(format) + ", " +
-                        objectToString(data) + ", " +
-                        objectToString(algorithm) + ", " +
-                        objectToString(extractable) + ", " +
-                        objectToString(usages) +
-                     ")";
-
-        return result;
-    }
-
-    // Character representation of any object we may use as a parameter.
-    function objectToString(obj) {
-        var keyValuePairs = [];
-
-        if (Array.isArray(obj)) {
-            return "[" + obj.map(function(elem){return objectToString(elem);}).join(", ") + "]";
-        } else if (typeof obj === "object") {
-            Object.keys(obj).sort().forEach(function(keyName) {
-                keyValuePairs.push(keyName + ": " + objectToString(obj[keyName]));
-            });
-            return "{" + keyValuePairs.join(", ") + "}";
-        } else if (typeof obj === "undefined") {
-            return "undefined";
-        } else {
-            return obj.toString();
-        }
-
-        var keyValuePairs = [];
-
-        Object.keys(obj).sort().forEach(function(keyName) {
-            var value = obj[keyName];
-            if (typeof value === "object") {
-                value = objectToString(value);
-            } else if (typeof value === "array") {
-                value = "[" + value.map(function(elem){return objectToString(elem);}).join(", ") + "]";
-            } else {
-                value = value.toString();
-            }
-
-            keyValuePairs.push(keyName + ": " + value);
-        });
-
-        return "{" + keyValuePairs.join(", ") + "}";
-    }
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.js
new file mode 100644
index 00000000000..5699341d9e4
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.js
@@ -0,0 +1,209 @@
+var subtle = crypto.subtle;
+
+function runTests(algorithmName) {
+    var algorithm = {name: algorithmName};
+    var data = keyData[algorithmName];
+    var jwkData = {jwk: {kty: data.jwk.kty, crv: data.jwk.crv, x: data.jwk.x}};
+
+    [true, false].forEach(function(extractable) {
+        // Test public keys first
+        allValidUsages(data.publicUsages, true).forEach(function(usages) {
+            ['spki', 'jwk', 'raw'].forEach(function(format) {
+                if (format === "jwk") { // Not all fields used for public keys
+                    testFormat(format, algorithm, jwkData, algorithmName, usages, extractable);
+                    // Test for https://github.com/WICG/webcrypto-secure-curves/pull/24
+                    if (extractable) {
+                        testJwkAlgBehaviours(algorithm, jwkData.jwk, algorithmName, usages);
+                    }
+                } else {
+                    testFormat(format, algorithm, data, algorithmName, usages, extractable);
+                }
+            });
+
+        });
+
+        // Next, test private keys
+        allValidUsages(data.privateUsages).forEach(function(usages) {
+            ['pkcs8', 'jwk'].forEach(function(format) {
+                testFormat(format, algorithm, data, algorithmName, usages, extractable);
+
+                // Test for https://github.com/WICG/webcrypto-secure-curves/pull/24
+                if (format === "jwk" && extractable) {
+                    testJwkAlgBehaviours(algorithm, data.jwk, algorithmName, usages);
+                }
+            });
+        });
+    });
+}
+
+
+// Test importKey with a given key format and other parameters. If
+// extrable is true, export the key and verify that it matches the input.
+function testFormat(format, algorithm, keyData, keySize, usages, extractable) {
+    promise_test(function(test) {
+        return subtle.importKey(format, keyData[format], algorithm, extractable, usages).
+            then(function(key) {
+                assert_equals(key.constructor, CryptoKey, "Imported a CryptoKey object");
+                assert_goodCryptoKey(key, algorithm, extractable, usages, (format === 'pkcs8' || (format === 'jwk' && keyData[format].d)) ? 'private' : 'public');
+                if (!extractable) {
+                    return;
+                }
+
+                return subtle.exportKey(format, key).
+                    then(function(result) {
+                        if (format !== "jwk") {
+                            assert_true(equalBuffers(keyData[format], result), "Round trip works");
+                        } else {
+                            assert_true(equalJwk(keyData[format], result), "Round trip works");
+                        }
+                    }, function(err) {
+                        assert_unreached("Threw an unexpected error: " + err.toString());
+                    });
+            }, function(err) {
+                assert_unreached("Threw an unexpected error: " + err.toString());
+            });
+    }, "Good parameters: " + keySize.toString() + " bits " + parameterString(format, keyData[format], algorithm, extractable, usages));
+}
+
+// Test importKey/exportKey "alg" behaviours, alg is ignored upon import and alg is missing for Ed25519 and Ed448 JWK export
+// https://github.com/WICG/webcrypto-secure-curves/pull/24
+function testJwkAlgBehaviours(algorithm, keyData, crv, usages) {
+    promise_test(function(test) {
+        return subtle.importKey('jwk', { ...keyData, alg: 'this is ignored' }, algorithm, true, usages).
+            then(function(key) {
+                assert_equals(key.constructor, CryptoKey, "Imported a CryptoKey object");
+
+                return subtle.exportKey('jwk', key).
+                    then(function(result) {
+                        assert_equals(Object.keys(result).length, keyData.d ? 6 : 5, "Correct number of JWK members");
+                        assert_equals(result.alg, undefined, 'No JWK "alg" member is present');
+                        assert_true(equalJwk(keyData, result), "Round trip works");
+                    }, function(err) {
+                        assert_unreached("Threw an unexpected error: " + err.toString());
+                    });
+            }, function(err) {
+                assert_unreached("Threw an unexpected error: " + err.toString());
+            });
+    }, "Good parameters with ignored JWK alg: " + crv.toString() + " " + parameterString('jwk', keyData, algorithm, true, usages));
+}
+
+
+
+// Helper methods follow:
+
+// Are two array buffers the same?
+function equalBuffers(a, b) {
+    if (a.byteLength !== b.byteLength) {
+        return false;
+    }
+
+    var aBytes = new Uint8Array(a);
+    var bBytes = new Uint8Array(b);
+
+    for (var i=0; i<a.byteLength; i++) {
+        if (aBytes[i] !== bBytes[i]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Are two Jwk objects "the same"? That is, does the object returned include
+// matching values for each property that was expected? It's okay if the
+// returned object has extra methods; they aren't checked.
+function equalJwk(expected, got) {
+    var fields = Object.keys(expected);
+    var fieldName;
+
+    for(var i=0; i<fields.length; i++) {
+        fieldName = fields[i];
+        if (!(fieldName in got)) {
+            return false;
+        }
+        if (expected[fieldName] !== got[fieldName]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Build minimal Jwk objects from raw key data and algorithm specifications
+function jwkData(keyData, algorithm) {
+    var result = {
+        kty: "oct",
+        k: byteArrayToUnpaddedBase64(keyData)
+    };
+
+    if (algorithm.name.substring(0, 3) === "AES") {
+        result.alg = "A" + (8 * keyData.byteLength).toString() + algorithm.name.substring(4);
+    } else if (algorithm.name === "HMAC") {
+        result.alg = "HS" + algorithm.hash.substring(4);
+    }
+    return result;
+}
+
+// Jwk format wants Base 64 without the typical padding at the end.
+function byteArrayToUnpaddedBase64(byteArray){
+    var binaryString = "";
+    for (var i=0; i<byteArray.byteLength; i++){
+        binaryString += String.fromCharCode(byteArray[i]);
+    }
+    var base64String = btoa(binaryString);
+
+    return base64String.replace(/=/g, "");
+}
+
+// Convert method parameters to a string to uniquely name each test
+function parameterString(format, data, algorithm, extractable, usages) {
+    if ("byteLength" in data) {
+        data = "buffer(" + data.byteLength.toString() + ")";
+    } else {
+        data = "object(" + Object.keys(data).join(", ") + ")";
+    }
+    var result = "(" +
+        objectToString(format) + ", " +
+        objectToString(data) + ", " +
+        objectToString(algorithm) + ", " +
+        objectToString(extractable) + ", " +
+        objectToString(usages) +
+        ")";
+
+    return result;
+}
+
+// Character representation of any object we may use as a parameter.
+function objectToString(obj) {
+    var keyValuePairs = [];
+
+    if (Array.isArray(obj)) {
+        return "[" + obj.map(function(elem){return objectToString(elem);}).join(", ") + "]";
+    } else if (typeof obj === "object") {
+        Object.keys(obj).sort().forEach(function(keyName) {
+            keyValuePairs.push(keyName + ": " + objectToString(obj[keyName]));
+        });
+        return "{" + keyValuePairs.join(", ") + "}";
+    } else if (typeof obj === "undefined") {
+        return "undefined";
+    } else {
+        return obj.toString();
+    }
+
+    var keyValuePairs = [];
+
+    Object.keys(obj).sort().forEach(function(keyName) {
+        var value = obj[keyName];
+        if (typeof value === "object") {
+            value = objectToString(value);
+        } else if (typeof value === "array") {
+            value = "[" + value.map(function(elem){return objectToString(elem);}).join(", ") + "]";
+        } else {
+            value = value.toString();
+        }
+
+        keyValuePairs.push(keyName + ": " + value);
+    });
+
+    return "{" + keyValuePairs.join(", ") + "}";
+}
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js
new file mode 100644
index 00000000000..49656489d42
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed25519.https.any.js
@@ -0,0 +1,9 @@
+// META: title=WebCryptoAPI: importKey() for OKP keys
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=okp_importKey_fixtures.js
+// META: script=okp_importKey.js
+
+
+// Test importKey and exportKey for OKP algorithms.
+runTests("Ed25519");
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js
new file mode 100644
index 00000000000..5bb7460c1fb
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_Ed448.https.any.js
@@ -0,0 +1,9 @@
+// META: title=WebCryptoAPI: importKey() for OKP keys
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=okp_importKey_fixtures.js
+// META: script=okp_importKey.js
+
+
+// Test importKey and exportKey for OKP algorithms.
+runTests("Ed448");
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js
new file mode 100644
index 00000000000..de1431d6cc2
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X25519.https.any.js
@@ -0,0 +1,9 @@
+// META: title=WebCryptoAPI: importKey() for OKP keys
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=okp_importKey_fixtures.js
+// META: script=okp_importKey.js
+
+
+// Test importKey and exportKey for OKP algorithms.
+runTests("X25519");
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js
new file mode 100644
index 00000000000..f8552be3c82
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_X448.https.any.js
@@ -0,0 +1,9 @@
+// META: title=WebCryptoAPI: importKey() for OKP keys
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=okp_importKey_fixtures.js
+// META: script=okp_importKey.js
+
+
+// Test importKey and exportKey for OKP algorithms.
+runTests("X448");
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_fixtures.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_fixtures.js
new file mode 100644
index 00000000000..58b41d52601
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_fixtures.js
@@ -0,0 +1,58 @@
+var keyData = {
+    "Ed25519": {
+        privateUsages: ["sign"],
+        publicUsages: ["verify"],
+        spki: new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 112, 3, 33, 0, 216, 225, 137, 99, 216, 9, 212, 135, 217, 84, 154, 204, 174, 198, 116, 46, 126, 235, 162, 77, 138, 13, 59, 20, 183, 227, 202, 234, 6, 137, 61, 204]),
+        raw: new Uint8Array([216, 225, 137, 99, 216, 9, 212, 135, 217, 84, 154, 204, 174, 198, 116, 46, 126, 235, 162, 77, 138, 13, 59, 20, 183, 227, 202, 234, 6, 137, 61, 204]),
+        pkcs8: new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32, 243, 200, 244, 196, 141, 248, 120, 20, 110, 140, 211, 191, 109, 244, 229, 14, 56, 155, 167, 7, 78, 21, 194, 53, 45, 205, 93, 48, 141, 76, 168, 31]),
+        jwk: {
+            crv: "Ed25519",
+            d: "88j0xI34eBRujNO_bfTlDjibpwdOFcI1Lc1dMI1MqB8",
+            x: "2OGJY9gJ1IfZVJrMrsZ0Ln7rok2KDTsUt-PK6gaJPcw",
+            kty: "OKP"
+        }
+    },
+
+    "Ed448": {
+        privateUsages: ["sign"],
+        publicUsages: ["verify"],
+        spki: new Uint8Array([48, 67, 48, 5, 6, 3, 43, 101, 113, 3, 58, 0, 171, 75, 184, 133, 253, 125, 44, 90, 242, 78, 131, 113, 12, 255, 160, 199, 74, 87, 226, 116, 128, 29, 178, 5, 123, 11, 220, 94, 160, 50, 182, 254, 107, 199, 139, 128, 69, 54, 90, 235, 38, 232, 110, 31, 20, 253, 52, 157, 7, 196, 132, 149, 245, 164, 106, 90, 128]),
+        raw: new Uint8Array([171, 75, 184, 133, 253, 125, 44, 90, 242, 78, 131, 113, 12, 255, 160, 199, 74, 87, 226, 116, 128, 29, 178, 5, 123, 11, 220, 94, 160, 50, 182, 254, 107, 199, 139, 128, 69, 54, 90, 235, 38, 232, 110, 31, 20, 253, 52, 157, 7, 196, 132, 149, 245, 164, 106, 90, 128]),
+        pkcs8: new Uint8Array([48, 71, 2, 1, 0, 48, 5, 6, 3, 43, 101, 113, 4, 59, 4, 57, 14, 255, 3, 69, 140, 40, 224, 23, 156, 82, 29, 227, 18, 201, 105, 183, 131, 67, 72, 236, 171, 153, 26, 96, 227, 178, 233, 167, 158, 76, 217, 228, 128, 239, 41, 23, 18, 210, 200, 61, 4, 114, 114, 213, 201, 244, 40, 102, 79, 105, 109, 38, 112, 69, 143, 29, 46]),
+        jwk: {
+            crv: "Ed448",
+            d: "Dv8DRYwo4BecUh3jEslpt4NDSOyrmRpg47Lpp55M2eSA7ykXEtLIPQRyctXJ9ChmT2ltJnBFjx0u",
+            x: "q0u4hf19LFryToNxDP-gx0pX4nSAHbIFewvcXqAytv5rx4uARTZa6ybobh8U_TSdB8SElfWkalqA",
+            kty: "OKP"
+        }
+    },
+
+    "X25519": {
+        privateUsages: ["deriveKey", "deriveBits"],
+        publicUsages: [],
+        spki: new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 110, 3, 33, 0, 28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
+        raw: new Uint8Array([28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
+        pkcs8: new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 110, 4, 34, 4, 32, 200, 131, 142, 118, 208, 87, 223, 183, 216, 201, 90, 105, 225, 56, 22, 10, 221, 99, 115, 253, 113, 164, 210, 118, 187, 86, 227, 168, 27, 100, 255, 97]),
+        jwk: {
+            crv: "X25519",
+            d: "yIOOdtBX37fYyVpp4TgWCt1jc_1xpNJ2u1bjqBtk_2E",
+            x: "HPKx5gIuxTc3Htf1PlT6EVTYPpjrZOpR-uWzMHz-lwY",
+            kty: "OKP"
+        }
+    },
+
+    "X448": {
+        privateUsages: ["deriveKey", "deriveBits"],
+        publicUsages: [],
+        spki: new Uint8Array([48, 66, 48, 5, 6, 3, 43, 101, 111, 3, 57, 0, 182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111]),
+        raw: new Uint8Array([182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111]),
+        pkcs8: new Uint8Array([48, 70, 2, 1, 0, 48, 5, 6, 3, 43, 101, 111, 4, 58, 4, 56, 88, 199, 210, 154, 62, 181, 25, 178, 157, 0, 207, 177, 145, 187, 100, 252, 109, 138, 66, 216, 241, 113, 118, 39, 43, 137, 242, 39, 45, 24, 25, 41, 92, 101, 37, 192, 130, 150, 113, 176, 82, 239, 7, 39, 83, 15, 24, 142, 49, 208, 204, 83, 191, 38, 146, 158]),
+        jwk: {
+            crv: "X448",
+            d: "WMfSmj61GbKdAM-xkbtk_G2KQtjxcXYnK4nyJy0YGSlcZSXAgpZxsFLvBydTDxiOMdDMU78mkp4",
+            x: "tgSh0aXNHZQm1WHvYwqesWy-adW5ymFe3FNjPvtS6jHm5qCh26zG52y85kgtfkuj1V2egCdlzm8",
+            kty: "OKP"
+        }
+    },
+
+};
diff --git a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js
index de9a5268827..4024674e3c3 100644
--- a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js
+++ b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js
@@ -1,10 +1,10 @@
 
-function run_test() {
+function run_test(algorithmName) {
   var subtle = self.crypto.subtle; // Change to test prefixed implementations
 
   // Source file [algorithm_name]_vectors.js provides the getTestVectors method
   // for the algorithm that drives these tests.
-  var testVectors = getTestVectors();
+  var testVectors = getTestVectors(algorithmName);
 
   testVectors.forEach(function(vector) {
       var algorithm = {name: vector.algorithmName};
diff --git a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js
new file mode 100644
index 00000000000..3be9eef41a9
--- /dev/null
+++ b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve25519.https.any.js
@@ -0,0 +1,6 @@
+// META: title=WebCryptoAPI: sign() and verify() Using EdDSA
+// META: script=eddsa_vectors.js
+// META: script=eddsa.js
+// META: timeout=long
+
+run_test("Ed25519");
diff --git a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js
similarity index 88%
rename from tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.https.any.js
rename to tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js
index 85993a48b91..6960c296bae 100644
--- a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_curve448.https.any.js
@@ -3,4 +3,4 @@
 // META: script=eddsa.js
 // META: timeout=long
 
-run_test();
+run_test("Ed448");
diff --git a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js
index ce80e0ea7e2..78240586c2e 100644
--- a/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js
+++ b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js
@@ -16,7 +16,7 @@
 //     algorithmName - the name of the AlgorithmIdentifier parameter to provide to sign
 //     data - the text to sign
 //     signature - the expected signature
-function getTestVectors() {
+function getTestVectors(algorithmName) {
   var pkcs8 = {
       "Ed25519": new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32, 243, 200, 244, 196, 141, 248, 120, 20, 110, 140, 211, 191, 109, 244, 229, 14, 56, 155, 167, 7, 78, 21, 194, 53, 45, 205, 93, 48, 141, 76, 168, 31]),
       "Ed448": new Uint8Array([48, 71, 2, 1, 0, 48, 5, 6, 3, 43, 101, 113, 4, 59, 4, 57, 14, 255, 3, 69, 140, 40, 224, 23, 156, 82, 29, 227, 18, 201, 105, 183, 131, 67, 72, 236, 171, 153, 26, 96, 227, 178, 233, 167, 158, 76, 217, 228, 128, 239, 41, 23, 18, 210, 200, 61, 4, 114, 114, 213, 201, 244, 40, 102, 79, 105, 109, 38, 112, 69, 143, 29, 46]),
@@ -37,7 +37,7 @@ function getTestVectors() {
   }
 
   var vectors = [];
-  ["Ed25519", "Ed448"].forEach(function(algorithmName) {
+  {
     var vector = {
       name: "EdDSA " + algorithmName,
       publicKeyBuffer: spki[algorithmName],
@@ -52,7 +52,7 @@ function getTestVectors() {
     };
 
     vectors.push(vector);
-  });
+  }
   return vectors;
 }
 
diff --git a/tests/wpt/tests/compute-pressure/README.md b/tests/wpt/tests/compute-pressure/README.md
index 7695c4a33e3..2b92e470ac1 100644
--- a/tests/wpt/tests/compute-pressure/README.md
+++ b/tests/wpt/tests/compute-pressure/README.md
@@ -1,2 +1,61 @@
-This directory contains (tentative) tests for the
+This directory contains tests for the
 [Compute Pressure](https://w3c.github.io/compute-pressure/) specification.
+
+## How to write tests
+### Tests that only need to run on a window
+To test this API, one needs to be able to control the pressure data that will
+be reported to script. At a high level, this is done by calling certain
+[WebDriver endpoints](https://w3c.github.io/compute-pressure/#automation) via
+their corresponding
+[testdriver](https://web-platform-tests.org/writing-tests/testdriver.html#compute-pressure)
+wrappers.
+
+### Tests that need to run on windows and dedicated workers
+Certain [testdriver
+limitations](https://web-platform-tests.org/writing-tests/testdriver.html#using-test-driver-in-other-browsing-contexts)
+require calls to be made from the top-level test context, which effectively
+prevents us from simply [running the same test from multiple globals with
+any.js](https://web-platform-tests.org/writing-tests/testharness.html#tests-for-other-or-multiple-globals-any-js).
+
+What we do instead is [write all tests for the Window
+global](https://web-platform-tests.org/writing-tests/testharness.html#window-tests),
+use
+[variants](https://web-platform-tests.org/writing-tests/testharness.html#specifying-test-variants)
+for specifying different globals and using the `pressure_test()` and
+`mark_as_done()` helpers.
+
+In short, the boilerplate for a new test `foo.https.window.js` looks like this:
+
+``` js
+// META: variant=?globalScope=window
+// META: variant=?globalScope=dedicated_worker
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/utils.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=./resources/common.js
+
+pressure_test(async t => {
+}, 'my test');
+
+mark_as_done();
+```
+
+- The variants specify which global context the tests should run on. The only
+  two options are `window` and `dedicated_worker`.
+- We need to include all those scripts for the testdriver and
+  [RemoteContext](../common/dispatcher/README.md) infrastructure to work.
+- `pressure_test()` is a wrapper around a `promise_test()` that takes care of
+  running the test either in the current context (when `globalScope=window`) or
+  in a dedicated worker via `RemoteContext` and `fetch_tests_from_worker()`
+  (when `globalScope=dedicated_worker`).
+- `mark_as_done()` is a no-op when `globalScope=window`, but is necessary when
+  `globalScope=dedicated_worker` to ensure that all tests have run and that
+  [`done()`](https://web-platform-tests.org/writing-tests/testharness-api.html#Test.done)
+  is called in the worker context.
+
+### Shared workers
+Since custom pressure states are stored in a top-level navigables, they are
+currently not integrated with shared workers (see [spec issue
+285](https://github.com/w3c/compute-pressure/issues/285)) and support for
+testing shared workers is limited.
diff --git a/tests/wpt/tests/compute-pressure/compute_pressure_basic.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_basic.https.window.js
similarity index 55%
rename from tests/wpt/tests/compute-pressure/compute_pressure_basic.https.any.js
rename to tests/wpt/tests/compute-pressure/compute_pressure_basic.https.window.js
index 15d572bd8ee..ff50ef4e561 100644
--- a/tests/wpt/tests/compute-pressure/compute_pressure_basic.https.any.js
+++ b/tests/wpt/tests/compute-pressure/compute_pressure_basic.https.window.js
@@ -1,48 +1,67 @@
 // META: timeout=long
-// META: script=/resources/test-only-api.js
-// META: script=resources/pressure-helpers.js
-// META: global=window,dedicatedworker,sharedworker
+// META: variant=?globalScope=window
+// META: variant=?globalScope=dedicated_worker
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/utils.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=./resources/common.js
 
 'use strict';
 
-pressure_test((t, mockPressureService) => {
+pressure_test(async (t) => {
   const observer = new PressureObserver(() => {
     assert_unreached('The observer callback should not be called');
   });
 
-  mockPressureService.setExpectedFailure(
-      new DOMException('', 'NotSupportedError'));
+  await create_virtual_pressure_source('cpu', {supported: false});
+  t.add_cleanup(async () => {
+    await remove_virtual_pressure_source('cpu');
+  });
   return promise_rejects_dom(t, 'NotSupportedError', observer.observe('cpu'));
 }, 'Return NotSupportedError when calling observer()');
 
-pressure_test(async (t, mockPressureService) => {
-  const changes = await new Promise(resolve => {
+pressure_test(async (t) => {
+  await create_virtual_pressure_source('cpu');
+  t.add_cleanup(async () => {
+    await remove_virtual_pressure_source('cpu');
+  });
+
+  const changes = await new Promise(async (resolve) => {
     const observer = new PressureObserver(resolve);
     t.add_cleanup(() => observer.disconnect());
-    observer.observe('cpu');
-    mockPressureService.setPressureUpdate('cpu', 'critical');
-    mockPressureService.startPlatformCollector(/*sampleInterval=*/ 200);
+    await update_virtual_pressure_source('cpu', 'critical');
+    await observer.observe('cpu');
   });
-  assert_true(changes.length === 1);
+  assert_equals(1, changes.length);
   assert_equals(changes[0].state, 'critical');
   assert_equals(changes[0].source, 'cpu');
   assert_equals(typeof changes[0].time, 'number');
 }, 'Basic functionality test');
 
-pressure_test((t, mockPressureService) => {
+pressure_test(async (t) => {
+  await create_virtual_pressure_source('cpu');
+  t.add_cleanup(async () => {
+    await remove_virtual_pressure_source('cpu');
+  });
+
   const observer = new PressureObserver(() => {
     assert_unreached('The observer callback should not be called');
   });
 
+  await update_virtual_pressure_source('cpu', 'critical');
   const promise = observer.observe('cpu');
   observer.unobserve('cpu');
-  mockPressureService.setPressureUpdate('cpu', 'critical');
-  mockPressureService.startPlatformCollector(/*sampleInterval=*/ 200);
 
   return promise_rejects_dom(t, 'AbortError', promise);
 }, 'Removing observer before observe() resolves works');
 
-pressure_test(async (t, mockPressureService) => {
+pressure_test(async (t) => {
+  await create_virtual_pressure_source('cpu');
+  t.add_cleanup(async () => {
+    await remove_virtual_pressure_source('cpu');
+  });
+
   const callbackPromises = [];
   const observePromises = [];
 
@@ -55,26 +74,27 @@ pressure_test(async (t, mockPressureService) => {
   }
 
   await Promise.all(observePromises);
-
-  mockPressureService.setPressureUpdate('cpu', 'critical');
-  mockPressureService.startPlatformCollector(/*sampleInterval=*/ 200);
-
+  await update_virtual_pressure_source('cpu', 'critical');
   return Promise.all(callbackPromises);
 }, 'Calling observe() multiple times works');
 
-pressure_test(async (t, mockPressureService) => {
+pressure_test(async (t) => {
+  await create_virtual_pressure_source('cpu');
+  t.add_cleanup(async () => {
+    await remove_virtual_pressure_source('cpu');
+  });
+
   const observer1_changes = [];
-  await new Promise(resolve => {
+  await new Promise(async (resolve) => {
     const observer1 = new PressureObserver(changes => {
       observer1_changes.push(changes);
       resolve();
     });
     t.add_cleanup(() => observer1.disconnect());
-    observer1.observe('cpu');
-    mockPressureService.setPressureUpdate('cpu', 'critical');
-    mockPressureService.startPlatformCollector(/*sampleInterval=*/ 200);
+    await update_virtual_pressure_source('cpu', 'critical');
+    await observer1.observe('cpu');
   });
-  assert_true(observer1_changes.length === 1);
+  assert_equals(1, observer1_changes.length);
   assert_equals(observer1_changes[0][0].source, 'cpu');
   assert_equals(observer1_changes[0][0].state, 'critical');
 
@@ -87,7 +107,9 @@ pressure_test(async (t, mockPressureService) => {
     t.add_cleanup(() => observer2.disconnect());
     observer2.observe('cpu');
   });
-  assert_true(observer2_changes.length === 1);
+  assert_equals(1, observer2_changes.length);
   assert_equals(observer2_changes[0][0].source, 'cpu');
   assert_equals(observer2_changes[0][0].state, 'critical');
 }, 'Starting a new observer after an observer has started works');
+
+mark_as_done();
diff --git a/tests/wpt/tests/compute-pressure/resources/common.js b/tests/wpt/tests/compute-pressure/resources/common.js
new file mode 100644
index 00000000000..4f666f1557e
--- /dev/null
+++ b/tests/wpt/tests/compute-pressure/resources/common.js
@@ -0,0 +1,141 @@
+'use strict';
+
+// Dependencies:
+// * /common/utils.js
+// * /common/dispatcher/dispatcher.js
+//
+// This file contains the required infrastructure to run Compute Pressure tests
+// in both window and worker scopes transparently.
+//
+// We cannot just use the '.any.js' mechanism with "META: global=window,etc"
+// because we need the worker needs to manipulate virtual pressure sources, and
+// we can only do that by posting a message to the embedder window to do it due
+// to testdriver's limitations and operation model.
+//
+// See README.md for how to use pressure_test() and other functions within this
+// file.
+//
+// Example:
+// - /compute-pressure/foo.https.window.js
+//   // META: variant=?globalScope=window
+//   // META: variant=?globalScope=dedicated_worker
+//   // META: script=/resources/testdriver.js
+//   // META: script=/resources/testdriver-vendor.js
+//   // META: script=/common/utils.js
+//   // META: script=/common/dispatcher/dispatcher.js
+//   // META: script=./resources/common.js
+//
+//   pressure_test(async t => {
+//     await create_virtual_pressure_source("cpu");
+//     t.add_cleanup(async () => {
+//       await remove_virtual_pressure_source("cpu")
+//     });
+//     /* rest of the test */
+//   }, "my test");
+//
+//   pressure_test(async t => { /* ... */ });
+//
+//   mark_as_done();
+
+class WindowHelper {
+  constructor() {
+    setup({explicit_done: true});
+
+    // These are the calls made by tests that use pressure_test(). We do not
+    // invoke the actual virtual pressure functions directly because of
+    // compatibility with the dedicated workers case, where these calls are
+    // done via postMessage (see resources/worker-support.js).
+    globalThis.create_virtual_pressure_source =
+        test_driver.create_virtual_pressure_source.bind(test_driver);
+    globalThis.remove_virtual_pressure_source =
+        test_driver.remove_virtual_pressure_source.bind(test_driver);
+    globalThis.update_virtual_pressure_source =
+        test_driver.update_virtual_pressure_source.bind(test_driver);
+  }
+
+  mark_as_done() {
+    done();
+  }
+
+  pressure_test(test_func, description) {
+    promise_test(test_func, description);
+  }
+}
+
+class DedicatedWorkerHelper {
+  constructor() {
+    this.token = token();
+
+    this.worker = new Worker(
+        `/compute-pressure/resources/worker-support.js?uuid=${this.token}`);
+    this.worker.onmessage = async (e) => {
+      if (!e.data.command) {
+        return;
+      }
+
+      switch (e.data.command) {
+        case 'create':
+          await test_driver.create_virtual_pressure_source(...e.data.params);
+          break;
+
+        case 'remove':
+          await test_driver.remove_virtual_pressure_source(...e.data.params);
+          break;
+
+        case 'update':
+          await test_driver.update_virtual_pressure_source(...e.data.params);
+          break;
+
+        default:
+          throw new Error(`Unexpected command '${e.data.command}'`);
+      }
+
+      this.worker.postMessage({
+        command: e.data.command,
+        id: e.data.id,
+      });
+    };
+
+    // We need to call this here so that the testharness RemoteContext
+    // infrastructure is set up before pressure_test() is called, as each test
+    // will be added after the worker scaffolding code has loaded.
+    this.fetch_tests_promise = fetch_tests_from_worker(this.worker);
+
+    this.ctx = new RemoteContext(this.token);
+
+    this.pending_tests = [];
+  }
+
+  async mark_as_done() {
+    await Promise.all(this.pending_tests);
+    await this.ctx.execute_script(() => {
+      done();
+    });
+    await this.fetch_tests_from_worker;
+  }
+
+  async pressure_test(test_func, description) {
+    this.pending_tests.push(this.ctx.execute_script(
+        `
+        (description) => promise_test(${test_func}, description);
+      `,
+        [description]));
+  }
+}
+
+let _pressureTestHelper;
+const _globalScope = new URLSearchParams(location.search).get('globalScope');
+switch (_globalScope) {
+  case 'window':
+    _pressureTestHelper = new WindowHelper();
+    break;
+  case 'dedicated_worker':
+    _pressureTestHelper = new DedicatedWorkerHelper();
+    break;
+  default:
+    throw new Error(`Invalid variant '${_globalScope}'`);
+}
+
+const pressure_test =
+    _pressureTestHelper.pressure_test.bind(_pressureTestHelper);
+const mark_as_done = _pressureTestHelper.mark_as_done.bind(_pressureTestHelper);
diff --git a/tests/wpt/tests/compute-pressure/resources/worker-support.js b/tests/wpt/tests/compute-pressure/resources/worker-support.js
new file mode 100644
index 00000000000..998bcd66610
--- /dev/null
+++ b/tests/wpt/tests/compute-pressure/resources/worker-support.js
@@ -0,0 +1,48 @@
+'use strict';
+
+importScripts('/resources/testharness.js');
+importScripts('/common/utils.js');
+importScripts('/common/dispatcher/dispatcher.js');
+
+function send_message(message) {
+  return new Promise((resolve, reject) => {
+    const id = token();
+    message.id = id;
+
+    addEventListener('message', function listener(e) {
+      if (!e.data.command || e.data.id !== id) {
+        return;
+      }
+
+      removeEventListener('message', listener);
+
+      if (e.data.command !== message.command) {
+        reject(`Expected reply with command '${message.command}', got '${
+            e.data.command}' instead`);
+        return;
+      }
+      if (e.data.error) {
+        reject(e.data.error);
+        return;
+      }
+      resolve();
+    });
+
+    postMessage(message);
+  });
+}
+
+function create_virtual_pressure_source(source, options = {}) {
+  return send_message({command: 'create', params: [source, options]});
+}
+
+function remove_virtual_pressure_source(source) {
+  return send_message({command: 'remove', params: [source]});
+}
+
+function update_virtual_pressure_source(source, state) {
+  return send_message({command: 'update', params: [source, state]});
+}
+
+const uuid = new URLSearchParams(location.search).get('uuid');
+const executor = new Executor(uuid);
diff --git a/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html
index 8aa8884914d..98052c42c1e 100644
--- a/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html
+++ b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html
@@ -6,9 +6,9 @@
 </head>
 <body>
 <iframe src="support/frame-with-csp.sub.html"></iframe>
-<div onclick="frames[0].location.href = 'javascript:parent.postMessage(\'executed\', \'*\')'" id="special_div"></div>
 <script nonce='abc'>
   var t = async_test("Should not have executed the javascript url");
+
   frames[0].addEventListener('load', () => {
     window.onmessage = t.step_func(function(e) {
       if (e.data == "executed")
@@ -16,9 +16,10 @@
     });
     window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
       assert_equals(e.blockedURI, 'inline');
-      assert_equals(e.violatedDirective, 'script-src-attr');
+      assert_equals(e.violatedDirective, 'script-src-elem');
     }));
-    document.getElementById('special_div').click();
+
+    frames[0].location.href = "javascript:parent.postMessage('executed', '*')";
   });
 </script>
 </body>
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html
new file mode 100644
index 00000000000..512c17f5fb7
--- /dev/null
+++ b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-a-b-a-embed.tentative.https.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<head>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<meta name="help" href="https://github.com/WICG/CHIPS#chips-cookies-having-independent-partitioned-state">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script src="/cookies/partitioned-cookies/resources/test-helpers.js"></script>
+<title>Test partitioned cookies consider ancestor chain</title>
+</head>
+<body>
+<script>
+  // This test is sets up an A1->B->A2 frame tree, where the top-level site is embedded
+  // in a cross-site embed. If the partitionKey of the cookie has a cross-site ancestor bit,
+  // the cookie set on site A1 will not be accessible on site A2.
+  promise_test(async() => {
+    assert_equals(document.cookie, "");
+
+    const partitionedCookie = "ancestor=chain";
+    const partitionedCookieAttributes =
+        "; Secure; Path=/; SameSite=None; Partitioned";
+    const partitionedCookieLine =
+        partitionedCookie + partitionedCookieAttributes;
+    document.cookie = partitionedCookieLine;
+
+    assert_true(document.cookie.includes(partitionedCookie));
+
+    const iframe = document.createElement("iframe");
+    const url = new URL(
+      "/cookies/partitioned-cookies/resources/" +
+          "ancestor-chain-cross-site-embed.html",
+          get_host_info().HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
+
+    iframe.src = url.href;
+    document.body.appendChild(iframe);
+
+    await fetch_tests_from_window(iframe.contentWindow);
+  }, "Setting Partitioned cookie on top-level site and embedding a cross-site iframe");
+
+</script>
+</body>
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-cross-site-embed.html b/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-cross-site-embed.html
new file mode 100644
index 00000000000..fbe2906737d
--- /dev/null
+++ b/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-cross-site-embed.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<head>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/cookies/resources/testharness-helpers.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<title>Test partitioned cookies ancestor chain: cross site embed</title>
+</head>
+<body>
+<script>
+
+promise_test(async () => {
+  assert_false(document.cookie.includes("ancestor=chain"));
+
+  const iframe = document.createElement("iframe");
+    const url = new URL(
+    "./ancestor-chain-same-site-embed.html",
+    get_host_info().ORIGIN + self.location.pathname);
+
+  iframe.src = url.href;
+  document.body.appendChild(iframe);
+  new Promise(r => iframe.onload = r);
+
+ await fetch_tests_from_window(iframe.contentWindow);
+
+}, "Embed same-site embed in cross-site");
+
+</script>
+</body>
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-same-site-embed.html b/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-same-site-embed.html
new file mode 100644
index 00000000000..f4036437951
--- /dev/null
+++ b/tests/wpt/tests/cookies/partitioned-cookies/resources/ancestor-chain-same-site-embed.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<head>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/cookies/resources/testharness-helpers.js"></script>
+<title>Test partitioned cookies ancestor chain: same site embed</title>
+</head>
+<body>
+<script>
+
+test(() => {
+  // The cookie set on the top-level site has no cross-site ancestor in and this embed has a
+  // cross-site ancestor. So the partitioned cookie should not be accessible.
+  assert_false(document.cookie.includes("ancestor=chain"));
+}, "Same-site embed with a cross-site parent partitioned cookie access");
+
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property-ref.html
new file mode 100644
index 00000000000..df27400fc12
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<style>
+  .background {
+    width: 200px;
+    height: 200px;
+    background-color: rgb(0, 85, 85);
+  }
+</style>
+
+<body>
+  <div class="background"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property.html
new file mode 100644
index 00000000000..e6c76ed5b83
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-property.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<link rel="help" href="ttps://www.w3.org/TR/css-easing-1/#...">
+<link rel="match" href="background-color-animation-custom-property-ref.html">
+<style>
+  @property --dark {
+    syntax: "<color>";
+    inherits: true;
+    initial-value: #000;
+  }
+
+  @property --light {
+    syntax: "<color>";
+    inherits: true;
+    initial-value: #fff;
+  }
+
+  @keyframes bgcolor {
+    0% {
+      background-color: var(--dark);
+    }
+
+    100% {
+      background-color: var(--light);
+    }
+  }
+
+  .background {
+    width: 200px;
+    height: 200px;
+    animation: bgcolor 20s steps(2, jump-both) -10s;
+  }
+
+  .background.colorize {
+    --dark: blue;
+    --light: green;
+  }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+
+<body>
+  <div id="anim" class="background"></div>
+
+  <script>
+    document.getAnimations()[0].ready.then(() => {
+      document.getElementById("anim").classList.add("colorize");
+      waitForAnimationFrames(3).then(takeScreenshot);
+    });
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-ref.html
new file mode 100644
index 00000000000..64bbf8e0f32
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<style>
+  .background {
+    width: 200px;
+    height: 200px;
+    background-color: rgb(21, 21, 21);
+  }
+</style>
+
+<body>
+  <div class="background"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse-ref.html
new file mode 100644
index 00000000000..830948959a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<style>
+  .background {
+    background-color: rgb(14, 14, 14);
+    width: 200px;
+    height: 200px;
+  }
+</style>
+
+<body>
+  <div class="background"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html
new file mode 100644
index 00000000000..00ec4c17261
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function-reverse.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<link rel="help" href="ttps://www.w3.org/TR/css-easing-1/#...">
+<link rel="match" href="background-color-animation-custom-timing-function-reverse-ref.html">
+<style>
+  @keyframes bgcolor {
+    0% {
+      background-color: rgb(90, 90, 90);
+    }
+
+    25% {
+      background-color: rgb(89, 89, 89);
+    }
+
+    50% {
+      background-color: rgb(90, 90, 90);
+    }
+
+    75% {
+      background-color: rgb(80, 80, 80);
+      animation-timing-function: cubic-bezier(0, -9, 1, -9);
+      /* Test that the correct keyframe's timing function is being used. */
+    }
+
+    100% {
+      background-color: rgb(90, 90, 90);
+    }
+  }
+
+  .background {
+    width: 200px;
+    height: 200px;
+    animation: bgcolor 10000000s -8717082s
+      /* halfway between the second to last and last keyframes.*/
+    ;
+  }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+
+<body>
+  <div class="background"></div>
+
+  <script>
+    document.getAnimations()[0].ready.then(() => {
+      waitForAnimationFrames(3).then(takeScreenshot);
+    });
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html
new file mode 100644
index 00000000000..69d5f542c55
--- /dev/null
+++ b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-custom-timing-function.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<link rel="help" href="ttps://www.w3.org/TR/css-easing-1/#...">
+<link rel="match" href="background-color-animation-custom-timing-function-ref.html">
+<style>
+  @keyframes bgcolor {
+    0% {
+      background-color: rgb(90, 90, 90);
+    }
+
+    25% {
+      background-color: rgb(80, 80, 80);
+    }
+
+    50% {
+      background-color: rgb(90, 90, 90);
+    }
+
+    75% {
+      background-color: rgb(80, 80, 80);
+    }
+
+    100% {
+      background-color: rgb(90, 90, 90);
+    }
+  }
+
+  .background {
+    width: 200px;
+    height: 200px;
+    animation: bgcolor 10000000s -1286796s
+      /* roughly where the derivative of the cubic-bezier is zero */
+    ;
+    animation-timing-function: cubic-bezier(0, 9, 1, 9);
+  }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+
+<body>
+  <div class="background"></div>
+
+  <script>
+    document.getAnimations()[0].ready.then(() => {
+      waitForAnimationFrames(3).then(takeScreenshot);
+    });
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html b/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-001-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html
rename to tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-001-crash.html
diff --git a/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html b/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-002-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html
rename to tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-002-crash.html
diff --git a/tests/wpt/tests/css/css-break/grid/grid-item-placement-crash-multiple.html b/tests/wpt/tests/css/css-break/grid/grid-item-placement-multiple-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/grid/grid-item-placement-crash-multiple.html
rename to tests/wpt/tests/css/css-break/grid/grid-item-placement-multiple-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-000.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-000-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-000.html
rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-000-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-001.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-001-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-001.html
rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-001-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-002.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-002-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-002.html
rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-002-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-001-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-001-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-002-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-002-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-003-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-003-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-004-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-004-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-005-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-005-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-006-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-006-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-007-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-007-crash.html
diff --git a/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-008-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html
rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-008-crash.html
diff --git a/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html b/tests/wpt/tests/css/css-cascade/scope-shadow.html
similarity index 96%
rename from tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html
rename to tests/wpt/tests/css/css-cascade/scope-shadow.html
index 83a468bd07b..6aa1f3fce80 100644
--- a/tests/wpt/tests/css/css-cascade/scope-shadow.tentative.html
+++ b/tests/wpt/tests/css/css-cascade/scope-shadow.html
@@ -104,7 +104,6 @@
   }, ':scope within :is() matches host via the scoping root');
 </script>
 
-<!-- Tentative. https://github.com/w3c/csswg-drafts/issues/9178 -->
 <div id=implicit_scope_shadow_parent>
   <div class=host>
     <template shadowrootmode=open>
@@ -133,7 +132,6 @@
   }, 'Implicit @scope as direct child of shadow root');
 </script>
 
-<!-- Tentative. https://github.com/w3c/csswg-drafts/issues/9178 -->
 <div id=implicit_scope_constructed>
   <div class=host>
     <template shadowrootmode=open>
diff --git a/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-link-crash.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-link-crash.html
new file mode 100644
index 00000000000..53470ee9af2
--- /dev/null
+++ b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-link-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1917703">
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+  const a = document.createElement("a");
+  a.setAttribute("style", "color-scheme: dark; background-color: MenuText")
+  a.setAttribute("href", "x")
+  document.documentElement.appendChild(a)
+})
+</script>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
index f7ee41410ea..2c4dc0f8e60 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
@@ -755,10 +755,6 @@
     fuzzy_test_valid_color(`lch(from var(--mycolor) l 0 h)`);
     fuzzy_test_valid_color(`var(--mygray)`);
     fuzzy_test_valid_color(`lch(from var(--mygray) l 30 h)`);
-
-    // Ensure that converting between legacy and modern sRGB color spaces work as expected.
-    fuzzy_test_valid_color(`color(from rebeccapurple srgb r g b)`, `color(srgb 0.4 0.2 0.6)`, 0.01);
-    fuzzy_test_valid_color(`rgb(from color(srgb 0.4 0.2 0.6) r g b)`, `color(srgb 0.4 0.2 0.6)`, 0.01);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-visited-getcomputedstyle.html b/tests/wpt/tests/css/css-color/relative-currentcolor-visited-getcomputedstyle.html
new file mode 100644
index 00000000000..443af36888a
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-visited-getcomputedstyle.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Relative color syntax and currentcolor with :visited don't leak information via getComputedStyle</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#relative-colors">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+
+<style>
+  a:link {
+    color: lime;
+  }
+
+  a:visited {
+    color: red;
+  }
+</style>
+
+<a href=""><span id="target">getComputedStyle should return lime for background-color on this element</span></a>
+
+<script>
+      test_computed_value("background-color", "rgb(from currentcolor r g b)", "color(srgb 0 1 0)", "should not leak :visited for computed style");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-parsing.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-parsing.html
new file mode 100644
index 00000000000..5c15a825853
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-parsing.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<title>CSS Conditional Test: @container overflowing query parsing</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#container-rule">
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#overflowing">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<div style="container-name:name;container-type:scroll-state">
+  <main id="cq-main"></main>
+</div>
+<script>
+  setup(() => assert_implements_container_queries());
+
+  test_cq_condition_known('scroll-state(overflowing)');
+  test_cq_condition_known('scroll-state(overflowing: none)');
+  test_cq_condition_known('scroll-state(overflowing: top)');
+  test_cq_condition_known('scroll-state(overflowing: left)');
+  test_cq_condition_known('scroll-state(overflowing: bottom)');
+  test_cq_condition_known('scroll-state(overflowing: right)');
+  test_cq_condition_known('scroll-state(overflowing: inline-start)');
+  test_cq_condition_known('scroll-state(overflowing: inline-end)');
+  test_cq_condition_known('scroll-state(overflowing: block-start)');
+  test_cq_condition_known('scroll-state(overflowing: block-end)');
+  test_cq_condition_known('(scroll-state(overflowing: inline-end))');
+  test_cq_condition_known('scroll-state((overflowing: left))');
+  test_cq_condition_known('scroll-state(not ((overflowing: bottom) and (overflowing: right)))');
+  test_cq_condition_known('scroll-state((overflowing: left) or (overflowing: top))');
+
+  test_cq_condition_unknown('scroll-state(overflowing: auto)');
+  test_cq_condition_unknown('scroll-state(overflowing: true)');
+  test_cq_condition_unknown('scroll-state(style(overflowing: left))');
+  test_cq_condition_unknown('style(scroll-state(overflowing: left))');
+  test_cq_condition_unknown('scroll-state(overflowing:)');
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-serialization.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-serialization.html
new file mode 100644
index 00000000000..f55cfeb6343
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-overflowing-serialization.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>CSS Container Queries: scroll-state(overflowing) conditionText serialization</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#container-queries">
+<link rel="help" href="https://drafts.csswg.org/cssom/#serialize-a-css-rule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<style id="testSheet">
+  @container scroll-state(        overflowing:left) { }
+  @container scroll-STate(overflowing:    ) { }
+  @container scroll-STate(overflowing) { }
+  @container  scroll-state(  ( overflowing: LEFT) OR ( OVERFLOWING: BOTTOM  ) ) { }
+  @container scroll-state (overflowing: right) { }
+</style>
+<script>
+  setup(() => {
+    assert_implements_container_queries();
+    assert_equals(testSheet.sheet.cssRules.length, 5);
+  });
+
+  const tests = [
+      ["scroll-state(overflowing: left)", "Normalize spaces"],
+      ["scroll-STate(overflowing:    )", "No value - invalid, serializes as <general-enclosed>"],
+      ["scroll-state(overflowing)", "Boolean context"],
+      ["scroll-state((overflowing: left) or (overflowing: bottom))", "Logical with 'or'"],
+      ["scroll-state (overflowing: right)", "Not a scroll-state function with space before '('"]
+  ].map((e, i) => [testSheet.sheet.cssRules[i], ...e]);
+
+  tests.forEach((t) => {
+    test(() => assert_equals(t[0].conditionText, t[1]), t[2]);
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-parsing.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-parsing.html
index b8872e89a45..5c9d8c1bb9e 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/at-container-parsing.html
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-parsing.html
@@ -5,165 +5,98 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/cq-testcommon.js"></script>
 <div style="container-name:name;container-type:size; width:100px; height:100px">
-  <main id=main></main>
+  <main id="cq-main"></main>
 </div>
 <script>
   setup(() => assert_implements_container_queries());
 
-  function cleanup_main() {
-    while (main.firstChild)
-      main.firstChild.remove();
-  }
+  test_cq_condition_known('(width)');
+  test_cq_condition_known('(min-width: 0px)');
+  test_cq_condition_known('(max-width: 0px)');
+  test_cq_condition_known('(height)');
+  test_cq_condition_known('(min-height: 0px)');
+  test_cq_condition_known('(max-height: 0px)');
+  test_cq_condition_known('(aspect-ratio)');
+  test_cq_condition_known('(min-aspect-ratio: 1/2)');
+  test_cq_condition_known('(max-aspect-ratio: 1/2)');
+  test_cq_condition_known('(orientation: portrait)');
+  test_cq_condition_known('(inline-size)');
+  test_cq_condition_known('(min-inline-size: 0px)');
+  test_cq_condition_known('(max-inline-size: 0px)');
+  test_cq_condition_known('(block-size)');
+  test_cq_condition_known('(min-block-size: 0px)');
+  test_cq_condition_known('(max-block-size: 0px)');
 
-  function set_style(text) {
-    let style = document.createElement('style');
-    style.innerText = text;
-    main.append(style);
-    return style;
-  }
+  test_cq_condition_known('(width: 100px)');
+  test_cq_condition_known('((width: 100px))');
+  test_cq_condition_known('(not (width: 100px))');
+  test_cq_condition_known('((width: 100px) and (height: 100px))');
+  test_cq_condition_known('(((width: 40px) or (width: 50px)) and (height: 100px))');
+  test_cq_condition_known('((width: 100px) and ((height: 40px) or (height: 50px)))');
+  test_cq_condition_known('(((width: 40px) and (height: 50px)) or (height: 100px))');
+  test_cq_condition_known('((width: 50px) or ((width: 40px) and (height: 50px)))');
+  test_cq_condition_known('((width: 100px) and (not (height: 100px)))');
+  test_cq_condition_known('(width < 100px)');
+  test_cq_condition_known('(width <= 100px)');
+  test_cq_condition_known('(width = 100px)');
+  test_cq_condition_known('(width > 100px)');
+  test_cq_condition_known('(width >= 100px)');
+  test_cq_condition_known('(100px < width)');
+  test_cq_condition_known('(100px <= width)');
+  test_cq_condition_known('(100px = width)');
+  test_cq_condition_known('(100px > width)');
+  test_cq_condition_known('(100px >= width)');
+  test_cq_condition_known('(100px < width < 200px)');
+  test_cq_condition_known('(100px < width <= 200px)');
+  test_cq_condition_known('(100px <= width < 200px)');
+  test_cq_condition_known('(100px > width > 200px)');
+  test_cq_condition_known('(100px > width >= 200px)');
+  test_cq_condition_known('(100px >= width > 200px)');
 
-  function test_rule_valid(query) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${query} {}`);
-      assert_equals(style.sheet.rules.length, 1);
-    }, query);
-  }
+  test_cq_condition_known('(width: calc(10px))');
+  test_cq_condition_known('(width: calc(10em))');
+  test_cq_condition_known('(width: calc(10px + 10em))');
+  test_cq_condition_known('(width < calc(10px + 10em))');
+  test_cq_condition_known('(width < max(10px, 10em))');
+  test_cq_condition_known('(calc(10px + 10em) < width)');
+  test_cq_condition_known('(calc(10px + 10em) < width < max(30px, 30em))');
+  test_cq_condition_known('(width: 100px) and (height: 100px)');
+  test_cq_condition_known('(width: 100px) or (height: 100px)');
+  test_cq_condition_known('not (width: 100px)');
 
-  function test_condition_invalid(condition) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container name ${condition} {}`);
-      assert_equals(style.sheet.rules.length, 0);
-    }, condition);
-  }
+  test_cq_condition_unknown('foo(width)');
+  test_cq_condition_unknown('size(width)');
+  test_cq_condition_unknown('(asdf)');
+  test_cq_condition_unknown('(resolution > 100dpi)');
+  test_cq_condition_unknown('(resolution: 150dpi)');
+  test_cq_condition_unknown('(resolution: calc(2x))');
+  test_cq_condition_unknown('(color)');
+  test_cq_condition_unknown('(min-color: 1)');
+  test_cq_condition_unknown('(color-index >= 1)');
+  test_cq_condition_unknown('size(grid)');
+  test_cq_condition_unknown('(grid)');
+  test_cq_condition_unknown('(width == 100px)');
+  test_cq_condition_unknown('(100px == width)');
+  test_cq_condition_unknown('(100px = width = 200px)');
+  test_cq_condition_unknown('(100px < width > 200px)');
+  test_cq_condition_unknown('(100px <= width >= 200px)');
+  test_cq_condition_unknown('(100px <= width > 200px)');
+  test_cq_condition_unknown('(100px < width >= 200px)');
+  test_cq_condition_unknown('(100px : width : 200px)');
 
-  // Tests that 1) the condition parses, and 2) is either "unknown" or not, as
-  // specified.
-  function test_condition_valid(condition, unknown) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`
-        @container name ${condition} {}
-        @container name (${condition}) or (not (${condition})) { main { --match:true; } }
-      `);
-      assert_equals(style.sheet.rules.length, 2);
-      const expected = unknown ? '' : 'true';
-      assert_equals(getComputedStyle(main).getPropertyValue('--match'), expected);
-    }, condition);
-  }
+  test_cq_condition_invalid('screen');
+  test_cq_condition_invalid('print');
+  test_cq_condition_invalid('not print');
+  test_cq_condition_invalid('only print');
+  test_cq_condition_invalid('screen and (width: 100px)');
+  test_cq_condition_invalid('screen or (width: 100px)');
+  test_cq_condition_invalid('not screen and (width: 100px)');
+  test_cq_condition_invalid('not screen or (width: 100px)');
+  test_cq_condition_invalid('(width: 100px), (height: 100px)');
+  test_cq_condition_invalid('foo (width: 100px)');
 
-  function test_condition_known(condition) {
-    test_condition_valid(condition, false /* unknown */);
-  }
-
-  function test_condition_unknown(condition) {
-    test_condition_valid(condition, true /* unknown */);
-  }
-
-  function test_container_name_invalid(container_name) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${container_name} not (width) {}`);
-      assert_equals(style.sheet.rules.length, 0);
-    }, `Container name: ${container_name}`);
-  }
-
-  function test_container_name_valid(container_name) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${container_name} not (width) {}`);
-      assert_equals(style.sheet.rules.length, 1);
-    }, `Container name: ${container_name}`);
-  }
-
-  test_condition_known('(width)');
-  test_condition_known('(min-width: 0px)');
-  test_condition_known('(max-width: 0px)');
-  test_condition_known('(height)');
-  test_condition_known('(min-height: 0px)');
-  test_condition_known('(max-height: 0px)');
-  test_condition_known('(aspect-ratio)');
-  test_condition_known('(min-aspect-ratio: 1/2)');
-  test_condition_known('(max-aspect-ratio: 1/2)');
-  test_condition_known('(orientation: portrait)');
-  test_condition_known('(inline-size)');
-  test_condition_known('(min-inline-size: 0px)');
-  test_condition_known('(max-inline-size: 0px)');
-  test_condition_known('(block-size)');
-  test_condition_known('(min-block-size: 0px)');
-  test_condition_known('(max-block-size: 0px)');
-
-  test_condition_known('(width: 100px)');
-  test_condition_known('((width: 100px))');
-  test_condition_known('(not (width: 100px))');
-  test_condition_known('((width: 100px) and (height: 100px))');
-  test_condition_known('(((width: 40px) or (width: 50px)) and (height: 100px))');
-  test_condition_known('((width: 100px) and ((height: 40px) or (height: 50px)))');
-  test_condition_known('(((width: 40px) and (height: 50px)) or (height: 100px))');
-  test_condition_known('((width: 50px) or ((width: 40px) and (height: 50px)))');
-  test_condition_known('((width: 100px) and (not (height: 100px)))');
-  test_condition_known('(width < 100px)');
-  test_condition_known('(width <= 100px)');
-  test_condition_known('(width = 100px)');
-  test_condition_known('(width > 100px)');
-  test_condition_known('(width >= 100px)');
-  test_condition_known('(100px < width)');
-  test_condition_known('(100px <= width)');
-  test_condition_known('(100px = width)');
-  test_condition_known('(100px > width)');
-  test_condition_known('(100px >= width)');
-  test_condition_known('(100px < width < 200px)');
-  test_condition_known('(100px < width <= 200px)');
-  test_condition_known('(100px <= width < 200px)');
-  test_condition_known('(100px > width > 200px)');
-  test_condition_known('(100px > width >= 200px)');
-  test_condition_known('(100px >= width > 200px)');
-
-  test_condition_known('(width: calc(10px))');
-  test_condition_known('(width: calc(10em))');
-  test_condition_known('(width: calc(10px + 10em))');
-  test_condition_known('(width < calc(10px + 10em))');
-  test_condition_known('(width < max(10px, 10em))');
-  test_condition_known('(calc(10px + 10em) < width)');
-  test_condition_known('(calc(10px + 10em) < width < max(30px, 30em))');
-  test_condition_known('(width: 100px) and (height: 100px)');
-  test_condition_known('(width: 100px) or (height: 100px)');
-  test_condition_known('not (width: 100px)');
-
-  test_condition_unknown('foo(width)');
-  test_condition_unknown('size(width)');
-  test_condition_unknown('(asdf)');
-  test_condition_unknown('(resolution > 100dpi)');
-  test_condition_unknown('(resolution: 150dpi)');
-  test_condition_unknown('(resolution: calc(2x))');
-  test_condition_unknown('(color)');
-  test_condition_unknown('(min-color: 1)');
-  test_condition_unknown('(color-index >= 1)');
-  test_condition_unknown('size(grid)');
-  test_condition_unknown('(grid)');
-  test_condition_unknown('(width == 100px)');
-  test_condition_unknown('(100px == width)');
-  test_condition_unknown('(100px = width = 200px)');
-  test_condition_unknown('(100px < width > 200px)');
-  test_condition_unknown('(100px <= width >= 200px)');
-  test_condition_unknown('(100px <= width > 200px)');
-  test_condition_unknown('(100px < width >= 200px)');
-  test_condition_unknown('(100px : width : 200px)');
-
-  test_condition_invalid('screen');
-  test_condition_invalid('print');
-  test_condition_invalid('not print');
-  test_condition_invalid('only print');
-  test_condition_invalid('screen and (width: 100px)');
-  test_condition_invalid('screen or (width: 100px)');
-  test_condition_invalid('not screen and (width: 100px)');
-  test_condition_invalid('not screen or (width: 100px)');
-  test_condition_invalid('(width: 100px), (height: 100px)');
-  test_condition_invalid('foo (width: 100px)');
-
-  test_rule_valid('name not (width <= 500px)');
-  test_rule_valid('not (width <= 500px)');
+  test_cq_rule_valid('name not (width <= 500px)');
+  test_cq_rule_valid('not (width <= 500px)');
 
   test_container_name_valid('foo');
   test_container_name_valid(' foo');
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-snapped-parsing.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-snapped-parsing.html
index 490c416a1ed..0a8fe50bc38 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/at-container-snapped-parsing.html
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-snapped-parsing.html
@@ -5,76 +5,25 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
 <div style="container-name:name;container-type:scroll-state">
-  <main id="main"></main>
+  <main id="cq-main"></main>
 </div>
 <script>
   setup(() => assert_implements_container_queries());
 
-  function cleanup_main() {
-    while (main.firstChild)
-      main.firstChild.remove();
-  }
+  test_cq_condition_known('scroll-state(snapped)');
+  test_cq_condition_known('scroll-state(snapped: x)');
+  test_cq_condition_known('scroll-state(snapped: y)');
+  test_cq_condition_known('scroll-state(snapped: none)');
+  test_cq_condition_known('scroll-state(snapped: block)');
+  test_cq_condition_known('scroll-state(snapped: inline)');
+  test_cq_condition_known('(scroll-state(snapped: block))');
+  test_cq_condition_known('scroll-state((snapped: inline))');
+  test_cq_condition_known('scroll-state(not ((snapped: inline) and (snapped: block)))');
+  test_cq_condition_known('scroll-state((snapped: x) or (snapped: y))');
 
-  function set_style(text) {
-    let style = document.createElement('style');
-    style.innerText = text;
-    main.append(style);
-    return style;
-  }
-
-  function test_rule_valid(query) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${query} {}`);
-      assert_equals(style.sheet.rules.length, 1);
-    }, query);
-  }
-
-  function test_condition_invalid(condition) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container name ${condition} {}`);
-      assert_equals(style.sheet.rules.length, 0);
-    }, condition);
-  }
-
-  // Tests that 1) the condition parses, and 2) is either "unknown" or not, as
-  // specified.
-  function test_condition_valid(condition, unknown) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`
-        @container name ${condition} {}
-        @container name (${condition}) or (not (${condition})) { main { --match:true; } }
-      `);
-      assert_equals(style.sheet.rules.length, 2);
-      const expected = unknown ? '' : 'true';
-      assert_equals(getComputedStyle(main).getPropertyValue('--match'), expected);
-    }, condition);
-  }
-
-  function test_condition_known(condition) {
-    test_condition_valid(condition, false /* unknown */);
-  }
-
-  function test_condition_unknown(condition) {
-    test_condition_valid(condition, true /* unknown */);
-  }
-
-  test_condition_known('scroll-state(snapped)');
-  test_condition_known('scroll-state(snapped: x)');
-  test_condition_known('scroll-state(snapped: y)');
-  test_condition_known('scroll-state(snapped: none)');
-  test_condition_known('scroll-state(snapped: block)');
-  test_condition_known('scroll-state(snapped: inline)');
-  test_condition_known('(scroll-state(snapped: block))');
-  test_condition_known('scroll-state((snapped: inline))');
-  test_condition_known('scroll-state(not ((snapped: inline) and (snapped: block)))');
-  test_condition_known('scroll-state((snapped: x) or (snapped: y))');
-
-  test_condition_unknown('scroll-state(snapped: auto)');
-  test_condition_unknown('scroll-state(snapped: true)');
-  test_condition_unknown('scroll-state(style(snapped: inline))');
-  test_condition_unknown('style(scroll-state(snapped: inline))');
-  test_condition_unknown('scroll-state(snapped:)');
+  test_cq_condition_unknown('scroll-state(snapped: auto)');
+  test_cq_condition_unknown('scroll-state(snapped: true)');
+  test_cq_condition_unknown('scroll-state(style(snapped: inline))');
+  test_cq_condition_unknown('style(scroll-state(snapped: inline))');
+  test_cq_condition_unknown('scroll-state(snapped:)');
 </script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-stuck-parsing.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-stuck-parsing.html
index e2d305cbb82..a3a1f01458d 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/at-container-stuck-parsing.html
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-stuck-parsing.html
@@ -5,81 +5,30 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
 <div style="container-name:name;container-type:scroll-state">
-  <main id="main"></main>
+  <main id="cq-main"></main>
 </div>
 <script>
   setup(() => assert_implements_container_queries());
 
-  function cleanup_main() {
-    while (main.firstChild)
-      main.firstChild.remove();
-  }
+  test_cq_condition_known('scroll-state(stuck)');
+  test_cq_condition_known('scroll-state(stuck: none)');
+  test_cq_condition_known('scroll-state(stuck: top)');
+  test_cq_condition_known('scroll-state(stuck: left)');
+  test_cq_condition_known('scroll-state(stuck: bottom)');
+  test_cq_condition_known('scroll-state(stuck: right)');
+  test_cq_condition_known('scroll-state(stuck: block-start)');
+  test_cq_condition_known('scroll-state(stuck: block-end)');
+  test_cq_condition_known('scroll-state(stuck: inline-start)');
+  test_cq_condition_known('scroll-state(stuck: inline-end)');
+  test_cq_condition_known('(scroll-state(stuck: top))');
+  test_cq_condition_known('scroll-state((stuck: top))');
+  test_cq_condition_known('scroll-state(not ((stuck: top) and (stuck: bottom)))');
+  test_cq_condition_known('scroll-state((stuck: right) or (stuck: left))');
 
-  function set_style(text) {
-    let style = document.createElement('style');
-    style.innerText = text;
-    main.append(style);
-    return style;
-  }
-
-  function test_rule_valid(query) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${query} {}`);
-      assert_equals(style.sheet.rules.length, 1);
-    }, query);
-  }
-
-  function test_condition_invalid(condition) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container name ${condition} {}`);
-      assert_equals(style.sheet.rules.length, 0);
-    }, condition);
-  }
-
-  // Tests that 1) the condition parses, and 2) is either "unknown" or not, as
-  // specified.
-  function test_condition_valid(condition, unknown) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`
-        @container name ${condition} {}
-        @container name (${condition}) or (not (${condition})) { main { --match:true; } }
-      `);
-      assert_equals(style.sheet.rules.length, 2);
-      const expected = unknown ? '' : 'true';
-      assert_equals(getComputedStyle(main).getPropertyValue('--match'), expected);
-    }, condition);
-  }
-
-  function test_condition_known(condition) {
-    test_condition_valid(condition, false /* unknown */);
-  }
-
-  function test_condition_unknown(condition) {
-    test_condition_valid(condition, true /* unknown */);
-  }
-
-  test_condition_known('scroll-state(stuck)');
-  test_condition_known('scroll-state(stuck: none)');
-  test_condition_known('scroll-state(stuck: top)');
-  test_condition_known('scroll-state(stuck: left)');
-  test_condition_known('scroll-state(stuck: bottom)');
-  test_condition_known('scroll-state(stuck: right)');
-  test_condition_known('scroll-state(stuck: block-start)');
-  test_condition_known('scroll-state(stuck: block-end)');
-  test_condition_known('scroll-state(stuck: inline-start)');
-  test_condition_known('scroll-state(stuck: inline-end)');
-  test_condition_known('(scroll-state(stuck: top))');
-  test_condition_known('scroll-state((stuck: top))');
-  test_condition_known('scroll-state(not ((stuck: top) and (stuck: bottom)))');
-  test_condition_known('scroll-state((stuck: right) or (stuck: left))');
-
-  test_condition_unknown('scroll-state(stuck: auto)');
-  test_condition_unknown('scroll-state(stuck: true)');
-  test_condition_unknown('scroll-state(style(stuck: top))');
-  test_condition_unknown('style(scroll-state(stuck: top))');
-  test_condition_unknown('scroll-state(stuck:)');
-  test_condition_unknown('scroll-state(--foo)');
+  test_cq_condition_unknown('scroll-state(stuck: auto)');
+  test_cq_condition_unknown('scroll-state(stuck: true)');
+  test_cq_condition_unknown('scroll-state(style(stuck: top))');
+  test_cq_condition_unknown('style(scroll-state(stuck: top))');
+  test_cq_condition_unknown('scroll-state(stuck:)');
+  test_cq_condition_unknown('scroll-state(--foo)');
 </script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/at-container-style-parsing.html b/tests/wpt/tests/css/css-conditional/container-queries/at-container-style-parsing.html
index 3ee22be9f5b..c63cc76560b 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/at-container-style-parsing.html
+++ b/tests/wpt/tests/css/css-conditional/container-queries/at-container-style-parsing.html
@@ -5,71 +5,20 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/cq-testcommon.js"></script>
 <div style="container-name:name">
-  <main id="main"></main>
+  <main id="cq-main"></main>
 </div>
 <script>
   setup(() => assert_implements_container_queries());
 
-  function cleanup_main() {
-    while (main.firstChild)
-      main.firstChild.remove();
-  }
+  test_cq_condition_known('style(--my-prop: foo)');
+  test_cq_condition_known('style(--my-prop: foo - bar ())');
+  test_cq_condition_known('style(not ((--foo: calc(10px + 2em)) and ((--foo: url(x)))))');
+  test_cq_condition_known('style((--foo: bar) or (--bar: 10px))');
+  test_cq_condition_known('style(--my-prop:)');
+  test_cq_condition_known('style(--my-prop: )');
+  test_cq_condition_known('style(--foo: bar !important)');
+  test_cq_condition_known('style(--foo)');
 
-  function set_style(text) {
-    let style = document.createElement('style');
-    style.innerText = text;
-    main.append(style);
-    return style;
-  }
-
-  function test_rule_valid(query) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container ${query} {}`);
-      assert_equals(style.sheet.rules.length, 1);
-    }, query);
-  }
-
-  function test_condition_invalid(condition) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`@container name ${condition} {}`);
-      assert_equals(style.sheet.rules.length, 0);
-    }, condition);
-  }
-
-  // Tests that 1) the condition parses, and 2) is either "unknown" or not, as
-  // specified.
-  function test_condition_valid(condition, unknown) {
-    test(t => {
-      t.add_cleanup(cleanup_main);
-      let style = set_style(`
-        @container name ${condition} {}
-        @container name (${condition}) or (not (${condition})) { main { --match:true; } }
-      `);
-      assert_equals(style.sheet.rules.length, 2);
-      const expected = unknown ? '' : 'true';
-      assert_equals(getComputedStyle(main).getPropertyValue('--match'), expected);
-    }, condition);
-  }
-
-  function test_condition_known(condition) {
-    test_condition_valid(condition, false /* unknown */);
-  }
-
-  function test_condition_unknown(condition) {
-    test_condition_valid(condition, true /* unknown */);
-  }
-
-  test_condition_known('style(--my-prop: foo)');
-  test_condition_known('style(--my-prop: foo - bar ())');
-  test_condition_known('style(not ((--foo: calc(10px + 2em)) and ((--foo: url(x)))))');
-  test_condition_known('style((--foo: bar) or (--bar: 10px))');
-  test_condition_known('style(--my-prop:)');
-  test_condition_known('style(--my-prop: )');
-  test_condition_known('style(--foo: bar !important)');
-  test_condition_known('style(--foo)');
-
-  test_condition_unknown('style(--foo: bar;)');
-  test_condition_unknown('style(style(--foo: bar))');
+  test_cq_condition_unknown('style(--foo: bar;)');
+  test_cq_condition_unknown('style(style(--foo: bar))');
 </script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/scroll-state-snapped-none.html b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state-snapped-none.html
new file mode 100644
index 00000000000..8c7aae56beb
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state-snapped-none.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>@container: scroll-state(snapped: none)</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#snapped">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<style>
+  #no-snap { container-type: scroll-state; }
+  @container scroll-state(snapped: none) {
+    #target { --snapped-none: true }
+  }
+  @container not scroll-state(snapped) {
+    #target { --snapped-boolean: true }
+  }
+</style>
+<div id="no-snap">
+  <div id="target"></div>
+</div>
+<script>
+  setup(() => assert_implements_container_queries());
+
+  test(() => {
+    assert_equals(getComputedStyle(target).getPropertyValue("--snapped-none"), "true");
+    assert_equals(getComputedStyle(target).getPropertyValue("--snapped-boolean"), "true");
+  }, "Check scroll-state(snapped:none) and scroll-state(snapped) for non-snapping container");
+
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/support/cq-testcommon.js b/tests/wpt/tests/css/css-conditional/container-queries/support/cq-testcommon.js
index 2eaca1dd091..672a7e9646e 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/support/cq-testcommon.js
+++ b/tests/wpt/tests/css/css-conditional/container-queries/support/cq-testcommon.js
@@ -1,3 +1,71 @@
 function assert_implements_container_queries() {
   assert_implements(CSS.supports("container-type:size"), "Basic support for container queries required");
 }
+
+function cleanup_container_query_main() {
+  const main = document.querySelector("#cq-main");
+  while (main.firstChild)
+    main.firstChild.remove();
+}
+
+function set_container_query_style(text) {
+  let style = document.createElement('style');
+  style.innerText = text;
+  document.querySelector("#cq-main").append(style);
+  return style;
+}
+
+function test_cq_rule_valid(query) {
+  test(t => {
+    t.add_cleanup(cleanup_container_query_main);
+    let style = set_container_query_style(`@container ${query} {}`);
+    assert_equals(style.sheet.rules.length, 1);
+  }, query);
+}
+
+function test_cq_condition_invalid(condition) {
+  test(t => {
+    t.add_cleanup(cleanup_container_query_main);
+    let style = set_container_query_style(`@container name ${condition} {}`);
+    assert_equals(style.sheet.rules.length, 0);
+  }, condition);
+}
+
+// Tests that 1) the condition parses, and 2) is either "unknown" or not, as
+// specified.
+function test_cq_condition_valid(condition, unknown) {
+  test(t => {
+    t.add_cleanup(cleanup_container_query_main);
+    let style = set_container_query_style(`
+      @container name ${condition} {}
+      @container name (${condition}) or (not (${condition})) { main { --match:true; } }
+    `);
+    assert_equals(style.sheet.rules.length, 2);
+    const expected = unknown ? '' : 'true';
+    assert_equals(getComputedStyle(document.querySelector("#cq-main")).getPropertyValue('--match'), expected);
+  }, condition);
+}
+
+function test_cq_condition_known(condition) {
+  test_cq_condition_valid(condition, false /* unknown */);
+}
+
+function test_cq_condition_unknown(condition) {
+  test_cq_condition_valid(condition, true /* unknown */);
+}
+
+function test_container_name_invalid(container_name) {
+  test(t => {
+    t.add_cleanup(cleanup_container_query_main);
+    let style = set_container_query_style(`@container ${container_name} not (width) {}`);
+    assert_equals(style.sheet.rules.length, 0);
+  }, `Container name: ${container_name}`);
+}
+
+function test_container_name_valid(container_name) {
+  test(t => {
+    t.add_cleanup(cleanup_container_query_main);
+    let style = set_container_query_style(`@container ${container_name} not (width) {}`);
+    assert_equals(style.sheet.rules.length, 1);
+  }, `Container name: ${container_name}`);
+}
diff --git a/tests/wpt/tests/css/css-flexbox/negative-overflow-003.html b/tests/wpt/tests/css/css-flexbox/negative-overflow-003.html
new file mode 100644
index 00000000000..e30c3ff0380
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/negative-overflow-003.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1114306">
+<meta name="assert" content="the correct scrollbars appear for sideways writing-mode flexboxes">
+
+<style>
+.container {
+  width: 100px; height: 100px;
+  overflow: scroll;
+  border: solid 3px;
+  display: inline-flex;
+  padding: 10px;
+  gap: 10px;
+  align-items: start;
+  margin: 10px;
+  vertical-align: bottom;
+}
+
+.item {
+  min-width: 110px; min-height: 110px;
+  background: cyan;
+}
+
+.container:hover::before {
+  position: fixed;
+  top: 0; left: 0;
+  font-size: 10px;
+  content: attr(style);
+  background: yellow;
+  direction: ltr;
+  writing-mode: horizontal-tb;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.container')">
+<script>
+const writingModes = ['sideways-rl', 'sideways-lr'];
+const directions = ['ltr', 'rtl'];
+const flexDirections = ['row', 'row-reverse', 'column', 'column-reverse'];
+const flexWraps = ['nowrap', 'wrap', 'wrap-reverse'];
+
+for (let writingMode of writingModes) {
+  for (let direction of directions) {
+    for (let flexDirection of flexDirections) {
+      for (let flexWrap of flexWraps) {
+        let container = document.createElement('div');
+        container.className = 'container';
+        container.style.writingMode = writingMode;
+        container.style.direction = direction;
+        container.style.flexDirection = flexDirection;
+        container.style.flexWrap = flexWrap;
+
+        for (let i = 0; i < 3; i++) {
+          let item = document.createElement('div');
+          item.className = 'item';
+          item.textContent = (i+1);
+          container.appendChild(item);
+        }
+
+        let bias = flexWrap != 'nowrap';
+        if (flexDirection == 'row' || flexDirection == 'row-reverse') {
+          bias = !bias;
+        }
+        container.setAttribute('data-expected-scroll-width', bias ? 130 : 370);
+        container.setAttribute('data-expected-scroll-height', bias ? 370 : 130);
+
+        document.body.appendChild(container);
+      }
+    }
+  }
+}
+</script>
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html
index 2429640f284..ae6765f6f64 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html
@@ -22,7 +22,7 @@
   text-box-trim: trim-start;
 }
 .outer, .inner {
-  text-box-edge: text;
+  text-box-edge: ex; /* ignored */
 }
 </style>
 <div class="spacer"></div>
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html
index 403eee5f842..4aaf3375abb 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html
@@ -5,10 +5,12 @@
 <style>
 .div-parent {
   outline: 1px solid orange;
-  font: 20px/1 Ahem;
+  font: 20px/3 Ahem;
 }
 </style>
 
 <div class="div-parent">
-  <div>Testline1<br><br><br>Testline2<br><br><br>Testline3</div>
+  <div>Testline1</div>
+  <div>Testline2</div>
+  <div>Testline3</div>
 </div>
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002-ref.html
index ae6a271312f..dc9855663c6 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002-ref.html
@@ -5,6 +5,9 @@
   background: lightgray;
   block-size: 20px;
 }
+.max-height > .spacer:first-child {
+  margin-top: 80px; /* avoid overlap */
+}
 
 .target {
   font: 100px/1 Ahem;
@@ -17,7 +20,8 @@
 }
 
 .max-height > .target {
-  height: 10px;
+  margin-top: -70px;
+  height: 80px;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002.html
index a3743e4bf9f..d2d59d46d03 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-height-002.html
@@ -10,12 +10,15 @@
   background: lightgray;
   block-size: 20px;
 }
+.max-height > .spacer:first-child {
+  margin-top: 80px; /* avoid overlap */
+}
 
 .target {
   font: 100px/2 Ahem;
   text-box-trim: trim-both;
   text-box-edge: text alphabetic;
-  align-content: end;
+  align-content: unsafe end;
 }
 
 .height > .target {
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html
index c1baf7957f7..7a3adc8b7e2 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html
@@ -8,10 +8,10 @@
 .target {
   font: 40px/1 Ahem;
   position: relative;
-  top: -80px;
+  top: -40px;
 }
 .target::first-letter {
-  initial-letter: 2 1;
+  font-size: 90px;
 }
 </style>
 <div class="spacer"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-crashtest.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-crash.html
similarity index 100%
rename from tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-crashtest.html
rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-crash.html
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-004.html
new file mode 100644
index 00000000000..0a25d8fa5ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-004.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CSS Masking: Test clip-path property and rect function</title>
+  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#funcdef-basic-shape-rect">
+  <link rel="match" href="reference/green-100x100.html">
+  <meta name="assert" content="The clip-path property takes the basic shape
+	'rect()' for clipping. On pass you should see a green rect without any red.">
+</head>
+<style>
+  #background {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background-color: green;
+  }
+  #rect {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background-color: red;
+    clip-path: rect(50px 0 0 50px);
+  }
+</style>
+<body>
+  <div id="background"></div>
+  <div id="rect"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-nesting/nested-declarations-cssom.html b/tests/wpt/tests/css/css-nesting/nested-declarations-cssom.html
index bfd56860ef4..ee8ba229523 100644
--- a/tests/wpt/tests/css/css-nesting/nested-declarations-cssom.html
+++ b/tests/wpt/tests/css/css-nesting/nested-declarations-cssom.html
@@ -113,19 +113,24 @@
     `);
     assert_equals(s.cssRules.length, 1);
     let outer = s.cssRules[0];
-    assert_equals(outer.cssRules.length, 2);
+    if (window.CSSScopeRule) {
+      assert_equals(outer.cssRules.length, 2);
 
-    // @scope
-    let scope = outer.cssRules[0];
-    assert_equals(scope.cssRules.length, 3);
-    assert_true(scope.cssRules[0] instanceof CSSNestedDeclarations);
-    assert_equals(scope.cssRules[0].cssText, `--x: 1; --y: 1;`);
-    assert_equals(scope.cssRules[1].cssText, `.b { }`); // Implicit :scope here.
-    assert_true(scope.cssRules[2] instanceof CSSNestedDeclarations);
-    assert_equals(scope.cssRules[2].cssText, `--z: 1;`);
+      // @scope
+      let scope = outer.cssRules[0];
+      assert_true(scope instanceof CSSScopeRule);
+      assert_equals(scope.cssRules.length, 3);
+      assert_true(scope.cssRules[0] instanceof CSSNestedDeclarations);
+      assert_equals(scope.cssRules[0].cssText, `--x: 1; --y: 1;`);
+      assert_equals(scope.cssRules[1].cssText, `.b { }`); // Implicit :scope here.
+      assert_true(scope.cssRules[2] instanceof CSSNestedDeclarations);
+      assert_equals(scope.cssRules[2].cssText, `--z: 1;`);
 
-    assert_true(outer.cssRules[1] instanceof CSSNestedDeclarations);
-    assert_equals(outer.cssRules[1].cssText, `--w: 1;`);
+      assert_true(outer.cssRules[1] instanceof CSSNestedDeclarations);
+      assert_equals(outer.cssRules[1].cssText, `--w: 1;`);
+    } else {
+      assert_equals(outer.cssRules.length, 0);
+    }
   }, 'Nested @scope rule');
 
   test(() => {
diff --git a/tests/wpt/tests/css/css-overflow/incremental-scroll.html b/tests/wpt/tests/css/css-overflow/incremental-scroll.html
index be1a1cbb74c..bed408c5c47 100644
--- a/tests/wpt/tests/css/css-overflow/incremental-scroll.html
+++ b/tests/wpt/tests/css/css-overflow/incremental-scroll.html
@@ -18,7 +18,7 @@ function scroll() {
   target.scrollTop += 500;
   if (target.scrollTop < 10000) {
     waitForAtLeastOneFrame().then(scroll);
-  } else if (window.testRunner) {
+  } else {
     takeScreenshot();
   }
 }
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-001-crash.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-001-crash.html
new file mode 100644
index 00000000000..9185f9802de
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-001-crash.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: `line-clamp: auto` unresolved BFC offset crash</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 1.5lh;
+}
+</style>
+
+<div class="clamp">
+  Line 1
+  <div>
+    <div></div>
+  </div>
+  Line 2
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html
new file mode 100644
index 00000000000..67e04e27f5f
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-035.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: `line-clamp: auto` with non-overflowing block with set height</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="With `line-clamp: auto`, the clamp point is set at the furthermost possible clamp point where the box doesn't go past the max-height. If there is an inner box with a set height, and it doesn't overflow, every clamp point inside it would increase the line-clamp container's block size by the same amount as the clamp point after the box.">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 6lh;
+  font: 16px / 32px serif;
+  white-space: pre;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.with-height {
+  height: 3lh;
+  background-color: red;
+}
+</style>
+
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="with-height">Line 5
+Line 6</div>
+Line 7</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html
new file mode 100644
index 00000000000..27b97e00ade
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-036.tentative.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: `line-clamp: auto` clamp between two fixed-height blocks</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-auto-036-ref.html">
+<meta name="assert" content="With `line-clamp: auto`, there can be a clamp point between two fixed-height blocks. And when the clamp point immediately follows a block that ends with a line box, that line box is ellipsized, even if there is space between the end of the line box and the end of the parent block.">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 7lh;
+  font: 16px / 32px serif;
+  white-space: pre;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.with-height {
+  height: 3lh;
+  background-color: orange;
+}
+.red {
+  background-color: red;
+}
+</style>
+
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="with-height">Line 5
+Line 6</div><div class="with-height red">Line 7
+Line 8</div>Line 9</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html
new file mode 100644
index 00000000000..4a2fc3c8206
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-037.tentative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: `line-clamp: auto` with non-zero max-height that doesn't fit any content</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-auto-011-ref.html">
+<meta name="assert" content="When line-clamp: auto is used with a max-height that isn't enough for any contained boxes or line boxes, then it should not show any content and its content box's intrinsic size should be zero">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 0.5lh;
+  font: 16px / 32px serif;
+  white-space: pre;
+  background-color: yellow;
+  border: 1px solid black;
+  padding: 4px;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4</div>
+<p>Following content.</p>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-032-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-032-ref.html
index 3b32f988cd9..4768c77ddab 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-032-ref.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-032-ref.html
@@ -28,7 +28,7 @@
 <div class="inner">Line 1
 Line 2
 Line 3
-Line 4…</div>
+Line 4</div>
 <div class="collapse-through"></div>
 <div class="abspos"></div>
 </div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-036-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-036-ref.html
new file mode 100644
index 00000000000..0ad96e88d14
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-auto-036-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  display: flow-root;
+  font: 16px / 32px serif;
+  white-space: pre;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.with-height {
+  height: 3lh;
+  background-color: orange;
+}
+</style>
+
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="with-height">Line 5
+Line 6…</div></div>
diff --git a/tests/wpt/tests/css/css-shadow-parts/host-part-002.html b/tests/wpt/tests/css/css-shadow-parts/host-part-002.html
new file mode 100644
index 00000000000..d508cd90024
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/host-part-002.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<title>CSS Shadow Parts - :host::part() cascading</title>
+<link rel="help" href="https://drafts.csswg.org/css-shadow-parts-1/#part">
+<link rel="help" href="https://drafts.csswg.org/css-scoping-1/#host-selector">
+<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#cascade-sort">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#specificity">
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="host"></div>
+
+<script>
+
+test(function() {
+  let host = document.getElementById("host");
+  let shadow = host.attachShadow({mode: "open"});
+  // Make three rules with equal specificity, so that they cascade by
+  // order.  Pseudo-elements and elements have the same specificity.
+  // Pseudo-classes and attribute selectors have the same specificity.
+  shadow.innerHTML = `
+    <style>
+      div[part="part-name"] {
+        color: red;
+      }
+      :host::part(part-name) {
+        color: lime;
+        background-color: red;
+      }
+      div[part="part-name"] {
+        background-color: green;
+      }
+    </style>
+    <div part="part-name"></div>
+  `;
+
+  let part_cs = getComputedStyle(shadow.querySelector('div[part="part-name"]'));
+
+  assert_equals(part_cs.color, "rgb(0, 255, 0)",
+                ":host::part() selectors override earlier selectors with " +
+                "same encapsulation context and specificity");
+  assert_equals(part_cs.backgroundColor, "rgb(0, 128, 0)",
+                ":host::part() selectors are overridden by later selectors " +
+                "with same encapsulation context and specificity");
+}, ":host::part has correct cascading behavior");
+
+</script>
diff --git a/tests/wpt/tests/css/css-shadow-parts/multiple-scopes.html b/tests/wpt/tests/css/css-shadow-parts/multiple-scopes.html
new file mode 100644
index 00000000000..2d92126baa3
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/multiple-scopes.html
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML>
+<title>::part() and pseudo-elements from multiple scopes (encapsulation contexts)</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-4/#cascade-sort">
+<link rel="help" href="https://drafts.csswg.org/css-shadow-parts/#part">
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+
+::part(e1)::file-selector-button { border-top-width: 7px; }
+::part(p1)::file-selector-button { border-top-color: red; }
+::file-selector-button { border-top-style: dashed; }
+
+</style>
+
+<body>
+
+<div id="outerhost"></div>
+
+<script>
+"use strict";
+
+let target_cs;
+
+test(t => {
+  let outer_host = document.getElementById("outerhost");
+  let outer_shadow = outer_host.attachShadow({mode: "open"});
+  outer_shadow.innerHTML = `
+    <style>
+      ::part(e1)::file-selector-button { border-right-width: 6px; }
+      ::part(p1)::file-selector-button { border-right-color: lime; }
+      ::file-selector-button { border-right-style: dotted; }
+    </style>
+    <div id="innerhost" exportparts="p1:e1"></div>
+  `;
+
+  let inner_host = outer_shadow.getElementById("innerhost");
+  let inner_shadow = inner_host.attachShadow({mode: "open"});
+  inner_shadow.innerHTML = `
+    <style>
+      ::part(e1)::file-selector-button { border-bottom-width: 5px; }
+      ::part(p1)::file-selector-button { border-bottom-color: red; }
+      ::file-selector-button { border: 3px double black; }
+    </style>
+    <input type="file" part="p1" id="target">
+  `;
+  target_cs = getComputedStyle(inner_shadow.getElementById("target"), "::file-selector-button");
+  assert_true(true);
+}, "successful test setup");
+
+test(t => {
+  assert_equals(target_cs.borderTopWidth, "7px");
+}, "exported part selector matches from outer scope");
+
+test(t => {
+  assert_equals(target_cs.borderTopColor, "rgb(0, 0, 0)");
+}, "non-exported part selector does not match from outer scope");
+
+test(t => {
+  assert_equals(target_cs.borderTopStyle, "double");
+}, "pseudo-element selector alone does not match from outer scope");
+
+test(t => {
+  assert_equals(target_cs.borderRightWidth, "3px");
+}, "exported part selector (for outer scope) does not match from middle scope");
+
+test(t => {
+  assert_equals(target_cs.borderRightColor, "rgb(0, 255, 0)");
+}, "correct part selector matches from middle scope");
+
+test(t => {
+  assert_equals(target_cs.borderRightStyle, "double");
+}, "pseudo-element selector alone does not match from middle scope");
+
+test(t => {
+  assert_equals(target_cs.borderBottomWidth, "3px");
+}, "selector with ::part(exported name) does not match from inner scope that exports the part");
+
+test(t => {
+  assert_equals(target_cs.borderBottomColor, "rgb(0, 0, 0)");
+}, "selector with ::part(original name) does not match from inner scope that exports the part");
+
+test(t => {
+  assert_equals(target_cs.borderBottomStyle, "double");
+}, "pseudo-element selector alone matches from inner scope");
+
+</script>
diff --git a/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-058.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-058.html
new file mode 100644
index 00000000000..b6d923f12bc
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-058.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1918576">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="This test verifies that the outer div's max-height shouldn't establish a percentage basis to resolve the target's height when computing outer div's min-content width.">
+
+<style>
+#reference-overlapped-green {
+  position: absolute;
+  background-color: green;
+  width: 100px;
+  height: 100px;
+  z-index: -1;
+}
+.outer {
+  width: min-content;
+  max-height: 100px;
+  background: red;
+}
+.target {
+  aspect-ratio: 1/1;
+  height: 100%;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="reference-overlapped-green"></div>
+<div class="outer">
+  <div class="target"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-017.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-017.html
index 190b2f8fe44..d7e5d70e43a 100644
--- a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-017.html
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-017.html
@@ -5,7 +5,7 @@
 <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=1910290">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
-<meta name="assert" content="This test verifies that the outer div's height is served as a percentage basis for its children when computing their intrinsic size contribution.">
+<meta name="assert" content="This test verifies that the inner div's used main size (height) serves as a percentage basis for the img's max-height. The img can transfer its max-height through the aspect-ratio to the inline axis when computing its intrinsic inline size contribution. This determines the inner div's used cross-size (width).">
 
 <style>
 .outer {
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-021.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-021.html
new file mode 100644
index 00000000000..8feec748cb2
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-021.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1919220">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="This test verifies that button's width is the same as the img's width, transferred from the img's height and aspect-ratio.">
+
+<style>
+button {
+  padding: 0;
+  border: 0;
+  height: 100px;
+  background: red;
+}
+img {
+  height: 100%;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<button>
+  <img src="aspect-ratio/support/200x200-green.png">
+</button>
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-022.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-022.html
new file mode 100644
index 00000000000..c8b114d8de1
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-022.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<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=1919220">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="This test verifies that fieldset's width is the same as the img's width, transferred from the img's height and aspect-ratio.">
+
+<style>
+fieldset {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  height: 100px;
+  width: fit-content;
+  background: red;
+}
+img {
+  height: 100%;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<fieldset>
+  <img src="aspect-ratio/support/200x200-green.png">
+</fieldset>
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-023.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-023.html
new file mode 100644
index 00000000000..b3d87a09722
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-023.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<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=1919220">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="This test verifies that fieldset's width is the same as the img's width, transferred from the img's height and aspect-ratio.">
+
+<style>
+fieldset {
+  margin: 0;
+  padding: 10px;
+  border: 0;
+  height: 80px;
+  width: fit-content;
+  /* create a red dot that should be covered by the <img> */
+  background: radial-gradient(red, red 50%, green 50%, green 100%);
+}
+img {
+  height: 100%;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<fieldset>
+  <img src="aspect-ratio/support/200x200-green.png">
+</fieldset>
diff --git a/tests/wpt/tests/css/css-text-decor/inheritance.html b/tests/wpt/tests/css/css-text-decor/inheritance.html
index ff4676fb939..89b1829e955 100644
--- a/tests/wpt/tests/css/css-text-decor/inheritance.html
+++ b/tests/wpt/tests/css/css-text-decor/inheritance.html
@@ -25,7 +25,7 @@ assert_not_inherited('text-decoration-color', 'rgba(2, 3, 4, 0.5)', 'rgba(42, 53
 assert_not_inherited('text-decoration-line', 'none', 'line-through');
 assert_not_inherited('text-decoration-style', 'solid', 'dashed');
 assert_inherited('text-emphasis-color', 'rgba(2, 3, 4, 0.5)', 'rgba(42, 53, 64, 0.75)');
-assert_inherited('text-emphasis-position', 'over', 'under left');
+assert_inherited('text-emphasis-position', 'auto', 'under left');
 assert_inherited('text-emphasis-style', 'none', 'triangle');
 assert_inherited('text-shadow', 'none', 'rgba(42, 53, 64, 0.75) 10px 20px 0px');
 assert_inherited('text-underline-position', 'auto', 'under');
diff --git a/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html
index 5898d70fbf3..31cb8703b9f 100644
--- a/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html
+++ b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html
@@ -6,6 +6,7 @@
 <div id="target"></div>
 <script>
 // Computed value: specified keyword(s)
+test_computed_value('text-emphasis-position', 'auto');
 test_computed_value('text-emphasis-position', 'over');
 test_computed_value('text-emphasis-position', 'under');
 test_computed_value('text-emphasis-position', 'over right', 'over');
diff --git a/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-invalid.html
new file mode 100644
index 00000000000..1b7d2ca406e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-invalid.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Emphasis Test: Parsing text-emphasis-position with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">
+<meta name="assert" content="text-decoration-position supports only the grammar 'auto | ([over | under] || [left | right]?)'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_invalid_value("text-emphasis-position", "auto auto");
+test_invalid_value("text-emphasis-position", "auto left");
+test_invalid_value("text-emphasis-position", "over auto");
+test_invalid_value("text-emphasis-position", "left over right");
+test_invalid_value("text-emphasis-position", "under right over");
+</script>
diff --git a/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-valid.html
new file mode 100644
index 00000000000..81f6f0f8208
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-valid.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Emphasis Test: Parsing text-emphasis-position with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">
+<meta name="assert" content="text-emphasis-position supports the full grammar 'auto | ([over | under] || [left | right]?)'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_valid_value("text-emphasis-position", "auto");
+test_valid_value("text-emphasis-position", "over left");
+test_valid_value("text-emphasis-position", "right under", "under");
+test_valid_value("text-emphasis-position", "over");
+test_valid_value("text-emphasis-position", "under");
+</script>
diff --git a/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001-ref.html
new file mode 100644
index 00000000000..2a50e456112
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>text-emphasis-position auto value</title>
+<style>
+p {
+	border: solid silver;
+	text-emphasis: dot;
+	margin: 0.5em;
+}
+
+div {
+	float: left;
+	margin: 0.5em;
+}
+</style>
+
+<div lang="zh" style="text-emphasis-position: under right">
+	<p>你好
+</div>
+
+<div lang="ja" style="text-emphasis-position: over right">
+	<p>今日は</p>
+</div>
+
+<div lang="ko" style="text-emphasis-position: over right">
+	<p>안녕하세요</p>
+</div>
+
+<div lang="zh" style="writing-mode: vertical-rl; text-emphasis-position: under right;">
+	<p>你好
+</div>
+
+<div lang="ja" style="writing-mode: vertical-rl; text-emphasis-position: over right;">
+	<p>今日は</p>
+</div>
+
+<div lang="ko" style="writing-mode: vertical-rl; text-emphasis-position: over right;">
+	<p>안녕하세요</p>
+</div>
diff --git a/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001.html
new file mode 100644
index 00000000000..09e4be9515f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-auto-001.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>text-emphasis-position auto value</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">
+<link rel="match" href="text-emphasis-position-auto-001-ref.html">
+<style>
+p {
+	border: solid silver;
+	text-emphasis: dot;
+	text-emphasis-position: auto;
+	margin: 0.5em;
+}
+
+div {
+	float: left;
+	margin: 0.5em;
+}
+</style>
+
+<div lang="zh">
+	<p>你好
+</div>
+
+<div lang="ja">
+	<p>今日は</p>
+</div>
+
+<div lang="ko">
+	<p>안녕하세요</p>
+</div>
+
+<div lang="zh" style="writing-mode: vertical-rl">
+	<p>你好
+</div>
+
+<div lang="ja" style="writing-mode: vertical-rl">
+	<p>今日は</p>
+</div>
+
+<div lang="ko" style="writing-mode: vertical-rl">
+	<p>안녕하세요</p>
+</div>
diff --git a/tests/wpt/tests/css/css-values/calc-invalid-parsing.html b/tests/wpt/tests/css/css-values/calc-invalid-parsing.html
index 937b8147c6f..0b268f102b3 100644
--- a/tests/wpt/tests/css/css-values/calc-invalid-parsing.html
+++ b/tests/wpt/tests/css/css-values/calc-invalid-parsing.html
@@ -9,4 +9,6 @@ test_invalid_value('transform', 'rotate(calc((0.25turn error)))');
 test_invalid_value('width', 'calc(7px * up)');
 test_invalid_value('width', 'round(nearest, 1px, 1px, 1px)');
 test_invalid_value('width', 'round(nearest, 1px)');
+test_invalid_value('width', 'calc([])');
+test_invalid_value('width', 'calc( [])');
 </script>
diff --git a/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html b/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html
index b1ef745e0db..93c4861ef10 100644
--- a/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html
+++ b/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html
@@ -38,6 +38,9 @@ body {
   animation-duration: 500s;
   opacity: 0;
 }
+::view-transition-image-pair(root) {
+  display: none;
+}
 ::view-transition-group(target) {
   animation-duration: 0s;
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/layered-capture/nested-opacity-ref.html b/tests/wpt/tests/css/css-view-transitions/layered-capture/nested-opacity-ref.html
new file mode 100644
index 00000000000..7db20046e03
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/layered-capture/nested-opacity-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<body>
+<style>
+    body {
+        margin: 0;
+    }
+
+    .parent {
+        opacity: .4;
+    }
+    .child {
+        left: 50px;
+        top: 50px;
+    }
+    div.green {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+        will-change: opacity;
+    }
+</style>
+    <div class="green parent">
+        <div class="green child"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/layered-capture/opacity-capture-observable-when-flat.tentative.html b/tests/wpt/tests/css/css-view-transitions/layered-capture/opacity-capture-observable-when-flat.tentative.html
new file mode 100644
index 00000000000..6d4ddbe86b1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/layered-capture/opacity-capture-observable-when-flat.tentative.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Captured opacity is applied as group style</title>
+<meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="nested-opacity-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="../nested/resources/compute-test.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        opacity: 0.7;
+        view-transition-name: parent;
+        will-change: opacity;
+    }
+
+    .child {
+        top: 50px;
+        left: 50px;
+    }
+
+    ::view-transition-group(parent) {
+        opacity: 0.4;
+        animation-name: none;
+    }
+    ::view-transition-old(*),
+    ::view-transition-new(*) {
+        animation-play-state: paused;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html b/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html
new file mode 100644
index 00000000000..e068b2918f1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects-ref.sub.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<title>Tree effects are captured as group style</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<style>
+    body {
+        margin: 0;
+        background: lightpink;
+    }
+
+    .target {
+        width: 100px;
+        height: 100px;
+        margin: 20px;
+        background: green;
+        will-change: {{GET[prop]}};
+    }
+
+    @keyframes anim {
+        from { {{GET[prop]}}: {{GET[old]}}; }
+        to { {{GET[prop]}}: {{GET[new]}}; }
+    }
+
+    .passthrough {
+        {{GET[prop]}}: {{GET[old]}};
+    }
+
+    .animate {
+        animation-name: anim;
+        animation-timing-function: steps(1, start);
+        animation-play-state: paused;
+        animation-duration: 100s;
+    }
+</style>
+<body>
+    <div class="override target"></div>
+    <div class="passthrough target"></div>
+    <div class="animate target"></div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html b/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html
new file mode 100644
index 00000000000..31bb324e633
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/layered-capture/tree-effects.tentative.sub.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Tree effects are captured as group style</title>
+<meta name=fuzzy content="maxDifference=0-10; totalPixels=0-200000">
+<meta name="variant" content="?prop=filter&old=blur(3px)&new=blur(10px)">
+<meta name="variant" content="?prop=opacity&old=0.3&new=1">
+<meta name="variant" content="?prop=clip-path&old=inset(10px 10px)&new=inset(20px 20px)">
+<meta name="variant" content="?prop=mask-image&old=linear-gradient(rgb(0 0 0 / 80%), transparent)&new=none">
+<meta name="variant" content="?prop=mask&old=linear-gradient(red,blue) luminance&new=none">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="tree-effects-ref.sub.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+    html {
+        view-transition-name: none;
+    }
+    body {
+        margin: 0;
+    }
+
+    .target {
+        width: 100px;
+        height: 100px;
+        margin: 20px;
+        background: green;
+        {{GET[prop]}}: {{GET[old]}};
+    }
+
+    html.vt-new .target {
+        {{GET[prop]}}: {{GET[new]}};
+    }
+
+    .override {
+        view-transition-name: override;
+    }
+
+    .passthrough {
+        view-transition-name: passthrough;
+    }
+    .animate {
+        view-transition-name: animate;
+    }
+
+    html::view-transition-group(*) {
+        animation-play-state: paused;
+    }
+
+    html::view-transition-group(override) {
+        {{GET[prop]}}: unset;
+        animation: none;
+    }
+
+    html::view-transition-group(animate) {
+        animation-timing-function: steps(1, start);
+        animation-play-state: paused;
+        animation-duration: 100s;
+    }
+
+    html::view-transition {
+        background: lightpink;
+    }
+</style>
+<body>
+    <div class="override target"></div>
+    <div class="passthrough target"></div>
+    <div class="animate target"></div>
+    <script>
+        const transition = document.startViewTransition(() => {
+            document.documentElement.classList.add("vt-new");
+        });
+        transition.ready.then(() => takeScreenshot());
+    </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/root-element-transition-iframe-with-startVT-on-main.html b/tests/wpt/tests/css/css-view-transitions/navigation/root-element-transition-iframe-with-startVT-on-main.html
index b7ef426121c..2a86f629acf 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/root-element-transition-iframe-with-startVT-on-main.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/root-element-transition-iframe-with-startVT-on-main.html
@@ -16,8 +16,8 @@
     background: lightpink;
   }
   ::view-transition-group(root) {
-    animation-duration: 300s;
-    opacity: 0;
+    visibility: hidden;
+    animation-play-state: paused;
   }
 
   ::view-transition-old(inner), ::view-transition-new(inner) {
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
index b5b12197712..dcf56b500f4 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
@@ -10,6 +10,8 @@
 <style>
     ::view-transition-group(yellow) {
         opacity: 0;
+        background: yellow;
+        animation: none;
     }
 
     .yellow {
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-opacity-ref.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-opacity-ref.html
new file mode 100644
index 00000000000..7db20046e03
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-opacity-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<body>
+<style>
+    body {
+        margin: 0;
+    }
+
+    .parent {
+        opacity: .4;
+    }
+    .child {
+        left: 50px;
+        top: 50px;
+    }
+    div.green {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+        will-change: opacity;
+    }
+</style>
+    <div class="green parent">
+        <div class="green child"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend-animated.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend-animated.tentative.html
new file mode 100644
index 00000000000..835f068c492
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend-animated.tentative.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Opacity should apply to the whole group</title>
+<meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="nested-opacity-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="resources/compute-test.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        view-transition-name: parent;
+    }
+
+    .vt-old .parent {
+        opacity: 0.4;
+    }
+
+    .child {
+        view-transition-name: child;
+        view-transition-group: parent;
+        top: 50px;
+        left: 50px;
+    }
+
+    ::view-transition-group(*),
+    ::view-transition-old(*),
+    ::view-transition-new(*) {
+        animation-play-state: paused;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend.tentative.html
new file mode 100644
index 00000000000..ea8acfc86b0
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/opacity-backdrop-blend.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Opacity should apply to the whole group</title>
+<meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="nested-opacity-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="resources/compute-test.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        view-transition-name: parent;
+        opacity: 0.4;
+    }
+
+    .child {
+        view-transition-name: child;
+        view-transition-group: parent;
+        top: 50px;
+        left: 50px;
+    }
+
+    ::view-transition-old(*),
+    ::view-transition-new(*) {
+        animation-play-state: paused;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/opacity-computed-style.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/opacity-computed-style.tentative.html
new file mode 100644
index 00000000000..f370b7b03d2
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/opacity-computed-style.tentative.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<title>Applied opacity should not be observable via getComputedStyle</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        view-transition-name: parent;
+        opacity: 0.4;
+    }
+
+    .child {
+        view-transition-name: child;
+        view-transition-group: parent;
+        top: 50px;
+        left: 50px;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+    <script>
+        promise_test(async t => {
+            const assert_opacity = label => {
+                assert_equals(getComputedStyle(parent).opacity, "0.4", label);
+            };
+            const parent = document.querySelector(".parent");
+            assert_opacity("before transition");
+            const transition = document.startViewTransition(() => {
+                assert_opacity("in update callback");
+            });
+            await transition.ready;
+            assert_opacity("when ready");
+            await transition.finished;
+            assert_opacity("when finished");
+        });
+    </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-done.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-done.tentative.html
new file mode 100644
index 00000000000..7616638dc5e
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-done.tentative.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Opacity should apply to the whole group</title>
+<meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="nested-opacity-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        view-transition-name: parent;
+        opacity: 0.4;
+        will-change: opacity;
+    }
+
+    .child {
+        view-transition-name: child;
+        view-transition-group: parent;
+        top: 50px;
+        left: 50px;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+    <script>
+onload = async () => {
+    const transition = document.startViewTransition();
+    await transition.updateCallbackDone;
+    transition.skipTransition();
+    await transition.finished;
+    takeScreenshot();
+};
+    </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-skip.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-skip.tentative.html
new file mode 100644
index 00000000000..e7a11ebe331
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/opacity-resets-after-skip.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Opacity should apply to the whole group</title>
+<meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="nested-opacity-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+    body {
+        margin: 0;
+    }
+    div {
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        background: green;
+    }
+
+    .parent {
+        view-transition-name: parent;
+        opacity: 0.4;
+        will-change: opacity;
+    }
+
+    .child {
+        view-transition-name: child;
+        view-transition-group: parent;
+        top: 50px;
+        left: 50px;
+    }
+</style>
+<body>
+    <div class="parent">
+        <div class="child"></div>
+    </div>
+    <script>
+onload = () => {
+    document.startViewTransition().finished.then(() => takeScreenshot());
+};
+    </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/resources/compute-test.js b/tests/wpt/tests/css/css-view-transitions/nested/resources/compute-test.js
index 4867c689f36..f71cf27b250 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/resources/compute-test.js
+++ b/tests/wpt/tests/css/css-view-transitions/nested/resources/compute-test.js
@@ -7,11 +7,14 @@ function add_rule() {
 }
 
 onload = async() => {
+    document.documentElement.classList.add("vt-old");
     const transition = document.startViewTransition(() => {
         document.documentElement.classList.add("vt-new");
+        document.documentElement.classList.remove("vt-old");
     });
     transition.finished.then(() => {
         document.documentElement.classList.remove("vt-new");
+        document.documentElement.classList.remove("vt-old");
     });
     transition.ready.then(() => takeScreenshot());
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html b/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html
index 70b6515fb5b..f23f63d28ff 100644
--- a/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html
+++ b/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
 <link rel="author" href="mailto:vmpstr@chromium.org">
 <link rel="match" href="new-and-old-sizes-match-ref.html">
-<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-300">
+<meta name="fuzzy" content="maxDifference=0-15; totalPixels=0-500">
 <script src="/common/reftest-wait.js"></script>
 <style>
 .box {
diff --git a/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html
index 18f323c3207..eeb7347981d 100644
--- a/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html
+++ b/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html
@@ -5,9 +5,12 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
 <link rel="author" href="mailto:vmpstr@chromium.org">
 <link rel="match" href="new-content-captures-different-size-ref.html">
-<meta name=fuzzy content="maxDifference=0-40; totalPixels=0-30000">
+<meta name=fuzzy content="maxDifference=0-100; totalPixels=0-15000">
 <script src="/common/reftest-wait.js"></script>
 <style>
+  html {
+    view-transition-name: none;
+  }
 .box {
   color: red;
   background: lightblue;
@@ -38,7 +41,7 @@
 
 div.dst { background: lightgreen; }
 /* We're verifying what we capture, so just display the new contents for 5 minutes.  */
-html::view-transition-group(*) { animation-duration: 300s; }
+html::view-transition-group(*) { animation-play-state: paused; }
 html::view-transition-new(*) { animation: unset; opacity: 1; }
 html::view-transition-old(*) { animation: unset; opacity: 0; }
 /* hide the root so we show transition background to ensure we're in a transition */
diff --git a/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html
index 7f3be742b0d..0a97c6db4d0 100644
--- a/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html
+++ b/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
 <link rel="author" href="mailto:vmpstr@chromium.org">
 <link rel="match" href="old-content-captures-different-size-ref.html">
-<meta name=fuzzy content="maxDifference=0-40; totalPixels=0-30000">
+<meta name=fuzzy content="maxDifference=0-50; totalPixels=0-30000">
 <script src="/common/reftest-wait.js"></script>
 <style>
 .box {
diff --git a/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html b/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html
index 17a8218b769..328d35c33b6 100644
--- a/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html
+++ b/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:khushalsagar@chromium.org">
 <link rel="match" href="transform-origin-view-transition-group-ref.html">
+<meta name="fuzzy" content="maxDifference=0-150; totalPixels=0-1000">
 
 <script src="/common/reftest-wait.js"></script>
 <style>
diff --git a/tests/wpt/tests/css/css-viewport/zoom/widget.html b/tests/wpt/tests/css/css-viewport/zoom/widget.html
new file mode 100644
index 00000000000..cd7a5446693
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/widget.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1918838">
+<link rel="help" href="https://drafts.csswg.org/css-viewport/#zoom-property">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<input type=checkbox>
+<input type=radio>
+<script>
+for (let i of document.querySelectorAll("input")) {
+  test(function() {
+    let unzoomed = i.getBoundingClientRect().width;
+    i.style.zoom = "2";
+    let zoomed = i.getBoundingClientRect().width;
+    assert_not_equals(unzoomed, zoomed, "Zoom should be applied");
+  }, i.type);
+}
+</script>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-progression-htb-002.html b/tests/wpt/tests/css/css-writing-modes/table-progression-htb-002.html
index 4007e0400f8..4e875054f85 100644
--- a/tests/wpt/tests/css/css-writing-modes/table-progression-htb-002.html
+++ b/tests/wpt/tests/css/css-writing-modes/table-progression-htb-002.html
@@ -3,7 +3,7 @@
 <title>CSS Test: horizontal-tb Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2016-01-15 -->
-<link rel="match" href="table-progression-002-ref.html">
+<link rel="match" href="table-progression-htb-002-ref.html">
 <meta name="assert" content="This test checks that horizontal-tb tables order columns left-to-right (LTR) or right-to-left (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
diff --git a/tests/wpt/tests/digital-credentials/identity-create.tentative.https.html b/tests/wpt/tests/digital-credentials/create.tentative.https.html
similarity index 71%
rename from tests/wpt/tests/digital-credentials/identity-create.tentative.https.html
rename to tests/wpt/tests/digital-credentials/create.tentative.https.html
index 027a796652e..299a240ced1 100644
--- a/tests/wpt/tests/digital-credentials/identity-create.tentative.https.html
+++ b/tests/wpt/tests/digital-credentials/create.tentative.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>Digital Identity Credential tests.</title>
+<title>Digital Credential API tests for create.</title>
 <link rel="help" href="https://wicg.github.io/digital-credentials/" />
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/resources/testharness.js"></script>
@@ -31,36 +31,36 @@
   });
 
   promise_test(async (t) => {
-    const result = await navigator.identity.create();
+    const result = await navigator.credentials.create();
     assert_equals(result, null);
-  }, "navigator.identity.create() frame just returns null.");
+  }, "navigator.credentials.create() frame just returns null.");
 
   promise_test(async (t) => {
     const { contentWindow: iframeWindow } = iframeSameOrigin;
-    const result = await iframeWindow.navigator.identity.create();
+    const result = await iframeWindow.navigator.credentials.create();
     assert_equals(result, null);
-  }, "navigator.identity.create() same-origin iframe just returns null.");
+  }, "navigator.credentials.create() same-origin iframe just returns null.");
 
   promise_test(async (t) => {
     const result = await sendMessage(iframeCrossOrigin, {
       action: "create",
     });
     assert_equals(result, null);
-  }, "navigator.identity.create() cross-origin iframe results in null.");
+  }, "navigator.credentials.create() cross-origin iframe results in null.");
 
   promise_test(async () => {
     for (const mediation of mediations) {
-      const result = await navigator.identity.create({ mediation });
+      const result = await navigator.credentials.create({ mediation });
       assert_equals(result, null);
     }
-  }, "navigator.identity.create() ignores mediations.");
+  }, "navigator.credentials.create() ignores mediations.");
 
   promise_test(async () => {
     for (const mediation of mediations) {
-      const result = await navigator.identity.create({ mediation });
+      const result = await navigator.credentials.create({ mediation });
       assert_equals(result, null);
     }
-  }, "navigator.identity.create() ignores mediations in same-origin iframe.");
+  }, "navigator.credentials.create() ignores mediations in same-origin iframe.");
 
   promise_test(async () => {
     for (const mediation of mediations) {
@@ -70,7 +70,7 @@
       });
       assert_equals(result, null);
     }
-  }, "navigator.identity.create() ignores mediations in cross-origin iframe.");
+  }, "navigator.credentials.create() ignores mediations in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
@@ -79,11 +79,11 @@
     await promise_rejects_dom(
       t,
       "AbortError",
-      navigator.identity.create({
+      navigator.credentials.create({
         signal,
       })
     );
-  }, "navigator.identity.create() rejects if called with an aborted signal.");
+  }, "navigator.credentials.create() rejects if called with an aborted controller.");
 
   promise_test(async (t) => {
     const { contentWindow: iframeWindow } = iframeSameOrigin;
@@ -94,11 +94,11 @@
       t,
       "AbortError",
       iframeWindow.DOMException,
-      iframeWindow.navigator.identity.create({
+      iframeWindow.navigator.credentials.create({
         signal,
       })
     );
-  }, "navigator.identity.create() rejects if called with an aborted signal in same-origin iframe.");
+  }, "navigator.credentials.create() rejects if called with an aborted controller in same-origin iframe.");
 
   promise_test(async (t) => {
     const result = await sendMessage(iframeCrossOrigin, {
@@ -107,14 +107,14 @@
     });
     assert_equals(result.constructor, "DOMException");
     assert_equals(result.name, "AbortError");
-  }, "navigator.identity.create() rejects if called with an aborted signal in cross-origin iframe.");
+  }, "navigator.credentials.create() rejects if called with an aborted controller in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
     const { signal } = abortController;
     abortController.abort();
     for (const mediation of mediations) {
-      const requestPromise = navigator.identity.create({
+      const requestPromise = navigator.credentials.create({
         mediation,
         signal,
       });
diff --git a/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
index 1d46c537360..742a94ec4eb 100644
--- a/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
+++ b/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
@@ -19,7 +19,7 @@
         await promise_rejects_js(
             test,
             TypeError,
-            navigator.identity.get(makeGetOptions([]))
+            navigator.credentials.get(makeGetOptions([]))
         );
 
         await test_feature_availability({
diff --git a/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html
index d3c6b91f260..616a3beb0b3 100644
--- a/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html
+++ b/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html
@@ -19,7 +19,7 @@
         await promise_rejects_dom(
             test,
             "NotAllowedError",
-            navigator.identity.get(makeGetOptions([]))
+            navigator.credentials.get(makeGetOptions([]))
         );
     }, "Permissions-Policy header digital-credentials-get=() disallows the top-level document.");
 
diff --git a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
index 0fc765e4a82..a59c5c72fa0 100644
--- a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
+++ b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
@@ -19,7 +19,7 @@
         await promise_rejects_js(
             test,
             TypeError,
-            navigator.identity.get(makeGetOptions([]))
+            navigator.credentials.get(makeGetOptions([]))
         );
     }, "Permissions-Policy header digital-credentials-get=(self) allows the top-level document.");
 
diff --git a/tests/wpt/tests/digital-credentials/get-user-activation.https.html b/tests/wpt/tests/digital-credentials/get-user-activation.https.html
index d4af78a9362..fbf2099dad3 100644
--- a/tests/wpt/tests/digital-credentials/get-user-activation.https.html
+++ b/tests/wpt/tests/digital-credentials/get-user-activation.https.html
@@ -18,9 +18,9 @@
     await promise_rejects_dom(
       t,
       "NotAllowedError",
-      navigator.identity.get(options)
+      navigator.credentials.get(options)
     );
-  }, "navigator.identity.get() calling the API without user activation should reject with NotAllowedError.");
+  }, "navigator.credentials.get() calling the API without user activation should reject with NotAllowedError.");
 
   promise_test(async (t) => {
     await test_driver.bless();
@@ -29,10 +29,10 @@
       "User activation should be active after test_driver.bless()."
     );
     const options = makeGetOptions([]);
-    await promise_rejects_js(t, TypeError, navigator.identity.get(options));
+    await promise_rejects_js(t, TypeError, navigator.credentials.get(options));
     assert_false(
       navigator.userActivation.isActive,
-      "User activation should be consumed after navigator.identity.get()."
+      "User activation should be consumed after navigator.credentials.get()."
     );
-  }, "navigator.identity.get() consumes user activation.");
+  }, "navigator.credentials.get() consumes user activation.");
 </script>
diff --git a/tests/wpt/tests/digital-credentials/identity-get.tentative.https.html b/tests/wpt/tests/digital-credentials/get.tentative.https.html
similarity index 75%
rename from tests/wpt/tests/digital-credentials/identity-get.tentative.https.html
rename to tests/wpt/tests/digital-credentials/get.tentative.https.html
index 527a69a6020..6de3ed8e90a 100644
--- a/tests/wpt/tests/digital-credentials/identity-get.tentative.https.html
+++ b/tests/wpt/tests/digital-credentials/get.tentative.https.html
@@ -35,35 +35,35 @@
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get()
+        global.navigator.credentials.get()
       );
 
       await promise_rejects_dom(
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({})
+        global.navigator.credentials.get({})
       );
 
       await promise_rejects_dom(
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({ x: "y" })
+        global.navigator.credentials.get({ x: "y" })
       );
 
       await promise_rejects_dom(
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({ x: "y", y: "z" })
+        global.navigator.credentials.get({ x: "y", y: "z" })
       );
 
       await promise_rejects_dom(
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({ mediation: "required" })
+        global.navigator.credentials.get({ mediation: "required" })
       );
 
       const abortController = new AbortController();
@@ -73,25 +73,25 @@
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({ signal })
+        global.navigator.credentials.get({ signal })
       );
 
       await promise_rejects_dom(
         t,
         "NotSupportedError",
         global.DOMException,
-        global.navigator.identity.get({ signal, mediation: "required" })
+        global.navigator.credentials.get({ signal, mediation: "required" })
       );
     }
-  }, "Calling navigator.identity.get() without an digital member same origin.");
+  }, "Calling navigator.credentials.get() without an digital member same origin.");
 
   promise_test(async (t) => {
     for (const provider of [undefined, []]) {
       const options = makeGetOptions(provider);
       await test_driver.bless("user activation");
-      await promise_rejects_js(t, TypeError, navigator.identity.get(options));
+      await promise_rejects_js(t, TypeError, navigator.credentials.get(options));
     }
-  }, "navigator.identity.get() API rejects if there are no providers.");
+  }, "navigator.credentials.get() API rejects if there are no providers.");
 
   promise_test(async (t) => {
     iframeSameOrigin.focus();
@@ -102,10 +102,10 @@
       await promise_rejects_js(
         t,
         iframeWindow.TypeError,
-        iframeWindow.navigator.identity.get(options)
+        iframeWindow.navigator.credentials.get(options)
       );
     }
-  }, "navigator.identity.get() API rejects if there are no providers for same-origin iframe.");
+  }, "navigator.credentials.get() API rejects if there are no providers for same-origin iframe.");
 
   promise_test(async (t) => {
     iframeCrossOrigin.focus();
@@ -117,7 +117,7 @@
       });
       assert_equals(result.constructor, "TypeError");
     }
-  }, "navigator.identity.get() API rejects if there are no providers in cross-origin iframe.");
+  }, "navigator.credentials.get() API rejects if there are no providers in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
@@ -127,10 +127,10 @@
       await promise_rejects_dom(
         t,
         "AbortError",
-        navigator.identity.get(options)
+        navigator.credentials.get(options)
       );
     }
-  }, "navigator.identity.get() promise is rejected if called with an aborted signal.");
+  }, "navigator.credentials.get() promise is rejected if called with an aborted controller.");
 
   promise_test(async (t) => {
     iframeSameOrigin.focus();
@@ -144,14 +144,14 @@
         t,
         "AbortError",
         iframeWindow.DOMException,
-        iframeWindow.navigator.identity.get(options)
+        iframeWindow.navigator.credentials.get(options)
       );
       assert_true(
         navigator.userActivation.isActive,
         "User activation is still active."
       );
     }
-  }, "navigator.identity.get() promise is rejected if called with an aborted signal in same-origin iframe.");
+  }, "navigator.credentials.get() promise is rejected if called with an aborted controller in same-origin iframe.");
 
   promise_test(async (t) => {
     iframeCrossOrigin.focus();
@@ -164,22 +164,23 @@
       assert_equals(result.constructor, "DOMException");
       assert_equals(result.name, "AbortError");
     }
-  }, "navigator.identity.get() promise is rejected if called with an aborted signal in cross-origin iframe.");
+  }, "navigator.credentials.get() promise is rejected if called with an aborted signal in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
     const { signal } = abortController;
     const options = makeGetOptions("openid4vp");
+    options.signal = signal;
     await test_driver.bless("user activation");
     const promise = promise_rejects_dom(
       t,
       "AbortError",
       DOMException,
-      navigator.identity.get(options)
+      navigator.credentials.get(options)
     );
     abortController.abort();
     await promise;
-  }, "navigator.identity.get() promise is rejected if abort controller is aborted after call to get().");
+  }, "navigator.credentials.get() promise is rejected if abort controller is aborted after call to get().");
 
   promise_test(async (t) => {
     iframeCrossOrigin.focus();
@@ -191,14 +192,14 @@
     });
     assert_equals(result.constructor, "DOMException");
     assert_equals(result.name, "AbortError");
-  }, "navigator.identity.get() promise is rejected if abort controller is aborted after call to get() in cross-origin iframe.");
+  }, "navigator.credentials.get() promise is rejected if abort controller is aborted after call to get() in cross-origin iframe.");
 
   promise_test(async (t) => {
     /** @type sequence<CredentialMediationRequirement> */
     const disallowedMediations = [ "conditional", "optional", "silent"];
     for (const mediation of disallowedMediations) {
       const options = makeGetOptions("default", mediation);
-      await promise_rejects_js(t, TypeError, navigator.identity.get(options));
+      await promise_rejects_js(t, TypeError, navigator.credentials.get(options));
     }
   }, "Mediation is required to get a DigitalCredential.");
 </script>
diff --git a/tests/wpt/tests/digital-credentials/historical.any.js b/tests/wpt/tests/digital-credentials/historical.any.js
new file mode 100644
index 00000000000..97e1565fe9f
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/historical.any.js
@@ -0,0 +1,3 @@
+test(() => {
+  assert_equals(navigator.identity, undefined);
+}, "navigator.identity is obsolete");
diff --git a/tests/wpt/tests/digital-credentials/support/helper.js b/tests/wpt/tests/digital-credentials/support/helper.js
index 60be755fa0e..0b71ae9822a 100644
--- a/tests/wpt/tests/digital-credentials/support/helper.js
+++ b/tests/wpt/tests/digital-credentials/support/helper.js
@@ -12,10 +12,10 @@
  * @param {CredentialMediationRequirement} [mediation="required"]
  * @returns {CredentialRequestOptions}
  */
-export function makeGetOptions(providersToUse = ["default"], mediation = "required") {
+export function makeGetOptions(providersToUse, mediation = "required") {
   if (typeof providersToUse === "string") {
     if (providersToUse === "default" || providersToUse === "openid4vp"){
-      return makeGetOptions([providersToUse]);
+      return makeGetOptions([providersToUse], mediation);
     }
   }
   if (!Array.isArray(providersToUse) || !providersToUse?.length) {
diff --git a/tests/wpt/tests/digital-credentials/support/iframe.html b/tests/wpt/tests/digital-credentials/support/iframe.html
index 0598cfb00be..6f3c072f29f 100644
--- a/tests/wpt/tests/digital-credentials/support/iframe.html
+++ b/tests/wpt/tests/digital-credentials/support/iframe.html
@@ -32,8 +32,6 @@
     }
     let result;
     try {
-      /** @type {CredentialsContainer} */
-      const identity = navigator.identity;
       if (data.abort === "before") {
         abortController.abort();
       }
@@ -43,13 +41,13 @@
           promise = Promise.resolve("pong");
           break;
         case "create":
-          promise = identity.create(data.options);
+          promise = navigator.credentials.create(data.options);
           break;
         case "get":
-          promise = identity.get(data.options);
+          promise = navigator.credentials.get(data.options);
           break;
         case "preventSilentAccess":
-          promise = identity.preventSilentAccess();
+          promise = navigator.credentials.preventSilentAccess();
           break;
         default:
           throw new Error(
diff --git a/tests/wpt/tests/docs/writing-tests/testdriver.md b/tests/wpt/tests/docs/writing-tests/testdriver.md
index b1428b6af71..a9e58c36d84 100644
--- a/tests/wpt/tests/docs/writing-tests/testdriver.md
+++ b/tests/wpt/tests/docs/writing-tests/testdriver.md
@@ -131,6 +131,13 @@ the global scope.
 .. js:autofunction:: test_driver.run_bounce_tracking_mitigations
 ```
 
+### Compute Pressure ###
+```eval_rst
+.. js:autofunction:: test_driver.create_virtual_pressure_source
+.. js:autofunction:: test_driver.update_virtual_pressure_source
+.. js:autofunction:: test_driver.remove_virtual_pressure_source
+```
+
 ### Using test_driver in other browsing contexts ###
 
 Testdriver can be used in browsing contexts (i.e. windows or frames)
diff --git a/tests/wpt/tests/document-picture-in-picture/display-mode.https.html b/tests/wpt/tests/document-picture-in-picture/display-mode.https.html
index 48885353576..1b20a3593fb 100644
--- a/tests/wpt/tests/document-picture-in-picture/display-mode.https.html
+++ b/tests/wpt/tests/document-picture-in-picture/display-mode.https.html
@@ -6,13 +6,11 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <body>
 <script>
-async_test((t) => {
-  test_driver.bless('request PiP window').then(t.step_func(_ => {
-    documentPictureInPicture.requestWindow().then(t.step_func_done(async (pipWindow) => {
-      await new Promise(requestAnimationFrame);
-      assert_true(pipWindow.matchMedia('(display-mode: picture-in-picture)'.matches));
-    }));
-  }));
+promise_test(async (t) => {
+  await test_driver.bless('request PiP window');
+  const pipWindow = await documentPictureInPicture.requestWindow();
+  await new Promise(requestAnimationFrame);
+  assert_true(!!pipWindow.matchMedia('(display-mode: picture-in-picture)'.matches));
 });
 </script>
 </body>
diff --git a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
index cc4d3119d21..e924f1f5e84 100644
--- a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
+++ b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
@@ -538,6 +538,581 @@ test(() => {
 }, "from(): Throws 'callable' error when @@iterator property is a " +
    "non-callable primitive");
 
-// TODO(dom@chromium.org): Add another test like the above, but for
-// `[Symbol.asyncIterator] = null` falling back to `[Symbol.iterator]`
-// conversion.
+// This test exercises the line of spec prose that says:
+//
+// "If |asyncIteratorMethodRecord|'s [[Value]] is undefined or null, then jump
+// to the step labeled 'From iterable'."
+test(() => {
+  const sync_iterable = {
+    [Symbol.asyncIterator]: null,
+    [Symbol.iterator]() {
+      return {
+        value: 0,
+        next() {
+          if (this.value === 2)
+            return {value: undefined, done: true};
+          else
+            return {value: this.value++, done: false};
+        }
+      }
+    },
+  };
+
+  const results = [];
+  const source = Observable.from(sync_iterable).subscribe(v => results.push(v));
+  assert_array_equals(results, [0, 1]);
+}, "from(): Async iterable protocol null, converts as iterator");
+
+promise_test(async t => {
+  const results = [];
+  const async_iterable = {
+    [Symbol.asyncIterator]() {
+      results.push("[Symbol.asyncIterator]() invoked");
+      return {
+        val: 0,
+        next() {
+          return new Promise(resolve => {
+            t.step_timeout(() => {
+              resolve({
+                value: this.val,
+                done: this.val++ === 4 ? true : false,
+              });
+            }, 400);
+          });
+        },
+      };
+    },
+  };
+
+  const source = Observable.from(async_iterable);
+  assert_array_equals(results, []);
+
+  await new Promise(resolve => {
+    source.subscribe({
+      next: v => {
+        results.push(`Observing ${v}`);
+        queueMicrotask(() => results.push(`next() microtask interleaving (v=${v})`));
+      },
+      complete: () => {
+        results.push('complete()');
+        resolve();
+      },
+    });
+  });
+
+  assert_array_equals(results, [
+    "[Symbol.asyncIterator]() invoked",
+    "Observing 0",
+    "next() microtask interleaving (v=0)",
+    "Observing 1",
+    "next() microtask interleaving (v=1)",
+    "Observing 2",
+    "next() microtask interleaving (v=2)",
+    "Observing 3",
+    "next() microtask interleaving (v=3)",
+    "complete()",
+  ]);
+}, "from(): Asynchronous iterable conversion");
+
+// This test is a more chaotic version of the above. It ensures that a single
+// Observable can handle multiple in-flight subscriptions to the same underlying
+// async iterable without the two subscriptions competing.
+//
+// This test is added because it is easy to imagine an implementation whereby
+// upon subscription, the Observable's internal subscribe callback takes the
+// underlying async iterable object, and simply pulls the async iterator off of
+// it (by invoking `@@asyncIterator`), and saves it alongside the underlying
+// async iterable. This async iterator would be used to manage values as they
+// are asynchronously emitted from the underlying object, but this value can get
+// OVERWRITTEN by a brand new subscription that comes in before the first
+// subscription has completed. In a broken implementation, this overwriting
+// would prevent the first subscription from ever completing.
+promise_test(async t => {
+  const async_iterable = {
+    slow: true,
+    [Symbol.asyncIterator]() {
+      // The first time @@asyncIterator is called, `shouldBeSlow` is true, and
+      // when the return object takes closure of it, all values are emitted
+      // SLOWLY asynchronously. The second time, `shouldBeSlow` is false, and
+      // all values are emitted FAST but still asynchronous.
+      const shouldBeSlow = this.slow;
+      this.slow = false;
+
+      return {
+        val: 0,
+        next() {
+          // Returns a Promise that resolves in a random amount of time less
+          // than a second.
+          return new Promise(resolve => {
+            t.step_timeout(() => resolve({
+              value: `${this.val}-${shouldBeSlow ? 'slow' : 'fast'}`,
+              done: this.val++ === 4 ? true : false,
+            }), shouldBeSlow ? 200 : 0);
+          });
+        },
+      };
+    },
+  };
+
+  const results = [];
+  const source = Observable.from(async_iterable);
+
+  const subscribeFunction = function(resolve, reject) {
+    source.subscribe({
+      next: v => results.push(v),
+      complete: () => resolve(),
+    });
+
+    // A broken implementation will rely on this timeout.
+    t.step_timeout(() => reject('TIMEOUT'), 3000);
+  }
+
+  const slow_promise = new Promise(subscribeFunction);
+  const fast_promise = new Promise(subscribeFunction);
+  await Promise.all([slow_promise, fast_promise]);
+  assert_array_equals(results, [
+    '0-fast',
+    '1-fast',
+    '2-fast',
+    '3-fast',
+    '0-slow',
+    '1-slow',
+    '2-slow',
+    '3-slow',
+  ]);
+}, "from(): Asynchronous iterable multiple in-flight subscriptions competing");
+
+promise_test(async () => {
+  const async_generator = async function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  };
+
+  const results = [];
+  const source = Observable.from(async_generator());
+
+  const subscribeFunction = function(resolve) {
+    source.subscribe({
+      next: v => results.push(v),
+      complete: () => resolve(),
+    });
+  }
+  await new Promise(subscribeFunction);
+  assert_array_equals(results, [1, 2, 3]);
+  await new Promise(subscribeFunction);
+  assert_array_equals(results, [1, 2, 3]);
+}, "from(): Asynchronous generator conversion: can only be used once");
+
+// The value returned by an async iterator object's `next()` method is supposed
+// to be a Promise. But this requirement "isn't enforced": see [1]. Therefore,
+// the Observable spec unconditionally wraps the return value in a resolved
+// Promise, as is standard practice [2].
+//
+// This test ensures that even if the object returned from an async iterator's
+// `next()` method is a synchronously-available object with `done: true`
+// (instead of a Promise), the `done` property is STILL not retrieved
+// synchronously. In other words, we test that the Promise-wrapping is
+// implemented.
+//
+// [1]: https://tc39.es/ecma262/#table-async-iterator-r
+// [2]: https://matrixlogs.bakkot.com/WHATWG/2024-08-30#L30
+promise_test(async () => {
+  const results = [];
+
+  const async_iterable = {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          return {
+            value: undefined,
+            get done() {
+              results.push('done() GETTER called');
+              return true;
+            },
+          };
+        },
+      };
+    },
+  };
+
+  const source = Observable.from(async_iterable);
+  assert_array_equals(results, []);
+
+  queueMicrotask(() => results.push('Microtask queued before subscription'));
+  source.subscribe();
+  assert_array_equals(results, []);
+
+  await Promise.resolve();
+  assert_array_equals(results, [
+    "Microtask queued before subscription",
+    "done() GETTER called",
+  ]);
+}, "from(): Promise-wrapping semantics of IteratorResult interface");
+
+// Errors thrown from [Symbol.asyncIterator] are propagated to the observer
+// synchronously. This is because in language constructs (i.e., for-await of
+// loops) that invoke [Symbol.asyncIterator]() that throw errors, the errors are
+// synchronously propagated to script outside of the loop, and are catchable.
+// Observables follow this precedent.
+test(() => {
+  const error = new Error("[Symbol.asyncIterator] error");
+  const results = [];
+  const async_iterable = {
+    [Symbol.asyncIterator]() {
+      results.push("[Symbol.asyncIterator]() invoked");
+      throw error;
+    }
+  };
+
+  Observable.from(async_iterable).subscribe({
+    error: e => results.push(e),
+  });
+
+  assert_array_equals(results, [
+    "[Symbol.asyncIterator]() invoked",
+    error,
+  ]);
+}, "from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously");
+
+// AsyncIterable: next() throws exception instead of return Promise. Any errors
+// that occur during the the retrieval of `next()` always result in a rejected
+// Promise. Therefore, the error makes it to the Observer with microtask timing.
+promise_test(async () => {
+  const nextError = new Error('next error');
+  const async_iterable = {
+    [Symbol.asyncIterator]() {
+      return {
+        get next() {
+          throw nextError;
+        }
+      };
+    }
+  };
+
+  const results = [];
+  Observable.from(async_iterable).subscribe({
+    error: e => results.push(e),
+  });
+
+  assert_array_equals(results, []);
+  // Wait one microtask since the error will be propagated through a rejected
+  // Promise managed by the async iterable conversion semantics.
+  await Promise.resolve();
+  assert_array_equals(results, [nextError]);
+}, "from(): Errors thrown in async iterator's next() GETTER are propagated " +
+   "in a microtask");
+promise_test(async () => {
+  const nextError = new Error('next error');
+  const async_iterable = {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          throw nextError;
+        }
+      };
+    }
+  };
+
+  const results = [];
+  Observable.from(async_iterable).subscribe({
+    error: e => results.push(e),
+  });
+
+  assert_array_equals(results, []);
+  await Promise.resolve();
+  assert_array_equals(results, [nextError]);
+}, "from(): Errors thrown in async iterator's next() are propagated in a microtask");
+
+test(() => {
+  const results = [];
+  const iterable = {
+    [Symbol.iterator]() {
+      return {
+        val: 0,
+        next() {
+          results.push(`IteratorRecord#next() pushing ${this.val}`);
+          return {
+            value: this.val,
+            done: this.val++ === 10 ? true : false,
+          };
+        },
+        return() {
+          results.push(`IteratorRecord#return() called with this.val=${this.val}`);
+        },
+      };
+    },
+  };
+
+  const ac = new AbortController();
+  Observable.from(iterable).subscribe(v => {
+    results.push(`Observing ${v}`);
+    if (v === 3) {
+      ac.abort();
+    }
+  }, {signal: ac.signal});
+
+  assert_array_equals(results, [
+    "IteratorRecord#next() pushing 0",
+    "Observing 0",
+    "IteratorRecord#next() pushing 1",
+    "Observing 1",
+    "IteratorRecord#next() pushing 2",
+    "Observing 2",
+    "IteratorRecord#next() pushing 3",
+    "Observing 3",
+    "IteratorRecord#return() called with this.val=4",
+  ]);
+}, "from(): Aborting sync iterable midway through iteration both stops iteration " +
+   "and invokes `IteratorRecord#return()");
+
+// This test exercises the logic of `GetIterator()` async->sync fallback
+// logic. Specifically, we have an object that is an async iterable — that is,
+// it has a callback [Symbol.asyncIterator] implementation. Observable.from()
+// detects this, and commits to converting the object from the async iterable
+// protocol. Then, after conversion but before subscription, the object is
+// modified such that it no longer implements the async iterable protocol.
+//
+// But since it still implements the *iterable* protocol, ECMAScript's
+// `GetIterator()` abstract algorithm [1] is fully exercised, which is spec'd to
+// fall-back to the synchronous iterable protocol if it exists, and create a
+// fully async iterable out of the synchronous iterable.
+//
+// [1]: https://tc39.es/ecma262/#sec-getiterator
+promise_test(async () => {
+  const results = [];
+  const async_iterable = {
+    asyncIteratorGotten: false,
+    get [Symbol.asyncIterator]() {
+      results.push("[Symbol.asyncIterator] GETTER");
+      if (this.asyncIteratorGotten) {
+        return null; // Both null and undefined work here.
+      }
+
+      this.asyncIteratorGotten = true;
+      // The only requirement for `this` to be converted as an async
+      // iterable -> Observable is that the return value be callable (i.e., a function).
+      return function() {};
+    },
+
+    [Symbol.iterator]() {
+      results.push('[Symbol.iterator]() invoked as fallback');
+      return {
+        val: 0,
+        next() {
+          return {
+            value: this.val,
+            done: this.val++ === 4 ? true : false,
+          };
+        },
+      };
+    },
+  };
+
+  const source = Observable.from(async_iterable);
+  assert_array_equals(results, [
+    "[Symbol.asyncIterator] GETTER",
+  ]);
+
+  await new Promise((resolve, reject) => {
+    source.subscribe({
+      next: v => {
+        results.push(`Observing ${v}`);
+        queueMicrotask(() => results.push(`next() microtask interleaving (v=${v})`));
+      },
+      error: e => reject(e),
+      complete: () => {
+        results.push('complete()');
+        resolve();
+      },
+    });
+  });
+
+  assert_array_equals(results, [
+    // Old:
+    "[Symbol.asyncIterator] GETTER",
+    // New:
+    "[Symbol.asyncIterator] GETTER",
+    "[Symbol.iterator]() invoked as fallback",
+    "Observing 0",
+    "next() microtask interleaving (v=0)",
+    "Observing 1",
+    "next() microtask interleaving (v=1)",
+    "Observing 2",
+    "next() microtask interleaving (v=2)",
+    "Observing 3",
+    "next() microtask interleaving (v=3)",
+    "complete()",
+  ]);
+}, "from(): Asynchronous iterable conversion, with synchronous iterable fallback");
+
+test(() => {
+  const results = [];
+  let generatorFinalized = false;
+
+  const generator = function*() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        yield n;
+      }
+    } finally {
+      generatorFinalized = true;
+    }
+  };
+
+  const observable = Observable.from(generator());
+  const abortController = new AbortController();
+
+  observable.subscribe(n => {
+    results.push(n);
+    if (n === 3) {
+      abortController.abort();
+    }
+  }, {signal: abortController.signal});
+
+  assert_array_equals(results, [0, 1, 2, 3]);
+  assert_true(generatorFinalized);
+}, "from(): Generator finally block runs when subscription is aborted");
+
+test(() => {
+  const results = [];
+  let generatorFinalized = false;
+
+  const generator = function*() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        yield n;
+      }
+    } catch {
+      assert_unreached("generator should not be aborted");
+    } finally {
+      generatorFinalized = true;
+    }
+  };
+
+  const observable = Observable.from(generator());
+
+  observable.subscribe((n) => {
+    results.push(n);
+  });
+
+  assert_array_equals(results, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+  assert_true(generatorFinalized);
+}, "from(): Generator finally block run when Observable completes");
+
+test(() => {
+  const results = [];
+  let generatorFinalized = false;
+
+  const generator = function*() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        yield n;
+      }
+      throw new Error('from the generator');
+    } finally {
+      generatorFinalized = true;
+    }
+  };
+
+  const observable = Observable.from(generator());
+
+  observable.subscribe({
+    next: n => results.push(n),
+    error: e => results.push(e.message)
+  });
+
+  assert_array_equals(results, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "from the generator"]);
+  assert_true(generatorFinalized);
+}, "from(): Generator finally block run when Observable errors");
+
+promise_test(async t => {
+  const results = [];
+  let generatorFinalized = false;
+
+  async function* asyncGenerator() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        yield n;
+      }
+    } finally {
+      generatorFinalized = true;
+    }
+  }
+
+  const observable = Observable.from(asyncGenerator());
+  const abortController = new AbortController();
+
+  await new Promise((resolve) => {
+    observable.subscribe((n) => {
+      results.push(n);
+      if (n === 3) {
+        abortController.abort();
+        resolve();
+      }
+    }, {signal: abortController.signal});
+  });
+
+  assert_array_equals(results, [0, 1, 2, 3]);
+  assert_true(generatorFinalized);
+}, "from(): Async generator finally block run when subscription is aborted");
+
+promise_test(async t => {
+  const results = [];
+  let generatorFinalized = false;
+
+  async function* asyncGenerator() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        yield n;
+      }
+    } finally {
+      generatorFinalized = true;
+    }
+  }
+
+  const observable = Observable.from(asyncGenerator());
+
+  await new Promise(resolve => {
+    observable.subscribe({
+      next: n => results.push(n),
+      complete: () => resolve(),
+    });
+  });
+
+  assert_array_equals(results, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+  assert_true(generatorFinalized);
+}, "from(): Async generator finally block runs when Observable completes");
+
+promise_test(async t => {
+  const results = [];
+  let generatorFinalized = false;
+
+  async function* asyncGenerator() {
+    try {
+      for (let n = 0; n < 10; n++) {
+        if (n === 4) {
+          throw new Error('from the async generator');
+        }
+        yield n;
+      }
+    } finally {
+      generatorFinalized = true;
+    }
+  }
+
+  const observable = Observable.from(asyncGenerator());
+
+  await new Promise((resolve) => {
+    observable.subscribe({
+      next: (n) => results.push(n),
+      error: (e) => {
+        results.push(e.message);
+        resolve();
+      }
+    });
+  });
+
+  assert_array_equals(results, [0, 1, 2, 3, "from the async generator"]);
+  assert_true(generatorFinalized);
+}, "from(): Async generator finally block run when Observable errors");
diff --git a/tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html b/tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html
index f5f981965ba..aa40ad9696f 100644
--- a/tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html
+++ b/tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
+<meta name="timeout" content="long">
 <script>
 addEventListener("load", () => {
   document.querySelector("svg").insertAdjacentText("afterend", `\n${" ".repeat(336860180)}`);
diff --git a/tests/wpt/tests/editing/data/indent.js b/tests/wpt/tests/editing/data/indent.js
index 4dd7d1feee0..0265552f093 100644
--- a/tests/wpt/tests/editing/data/indent.js
+++ b/tests/wpt/tests/editing/data/indent.js
@@ -2,97 +2,116 @@
 var browserTests = [
 ["foo[]bar<p>extra",
     [["indent",""]],
-    "<blockquote>foo[]bar</blockquote><p>extra</p>",
+    ["<blockquote>foo[]bar</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[]bar</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<span>foo</span>{}<span>bar</span><p>extra",
     [["indent",""]],
-    "<blockquote><span>foo</span>{}<span>bar</span></blockquote><p>extra</p>",
+    ["<blockquote><span>foo</span>{}<span>bar</span></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><span>foo</span>{}<span>bar</span></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<span>foo[</span><span>]bar</span><p>extra",
     [["indent",""]],
-    "<blockquote><span>foo[</span><span>]bar</span></blockquote><p>extra</p>",
+    ["<blockquote><span>foo[</span><span>]bar</span></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><span>foo[</span><span>]bar</span></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[bar]baz<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar]baz</blockquote><p>extra</p>",
+    ["<blockquote>foo[bar]baz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar]baz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p dir=rtl>פו[בר]בז<p dir=rtl>נוםף",
     [["indent",""]],
-    "<blockquote><p dir=\"rtl\">פו[בר]בז</p></blockquote><p dir=\"rtl\">נוםף</p>",
+    ["<blockquote><p dir=\"rtl\">פו[בר]בז</p></blockquote><p dir=\"rtl\">נוםף</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p dir=\"rtl\">פו[בר]בז</p></blockquote><p dir=\"rtl\">נוםף</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p dir=rtl>פו[ברבז<p>Foobar]baz<p>Extra",
     [["indent",""]],
-    "<blockquote><p dir=\"rtl\">פו[ברבז</p><p>Foobar]baz</p></blockquote><p>Extra</p>",
+    ["<blockquote><p dir=\"rtl\">פו[ברבז</p><p>Foobar]baz</p></blockquote><p>Extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p dir=\"rtl\">פו[ברבז</p><p>Foobar]baz</p></blockquote><p>Extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>Foo[barbaz<p dir=rtl>פובר]בז<p>Extra",
     [["indent",""]],
-    "<blockquote><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></blockquote><p>Extra</p>",
+    ["<blockquote><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></blockquote><p>Extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></blockquote><p>Extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<div><p>Foo[barbaz<p dir=rtl>פובר]בז</div><p>Extra",
     [["indent",""]],
-    "<blockquote><div><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></div></blockquote><p>Extra</p>",
+    ["<blockquote><div><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></div></blockquote><p>Extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><div><p>Foo[barbaz</p><p dir=\"rtl\">פובר]בז</p></div></blockquote><p>Extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo]bar[baz<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar]baz</blockquote><p>extra</p>",
+    ["<blockquote>foo[bar]baz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar]baz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["{<p><p> <p>foo</p>}<p>extra",
     [["indent",""]],
-    "<blockquote>{<p></p><p> </p><p>foo</p>}</blockquote><p>extra</p>",
+    ["<blockquote>{<p></p><p> </p><p>foo</p>}</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">{<p></p><p> </p><p>foo</p>}</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[bar<i>baz]qoz</i>quz<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar<i>baz]qoz</i>quz</blockquote><p>extra</p>",
+    ["<blockquote>foo[bar<i>baz]qoz</i>quz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar<i>baz]qoz</i>quz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["[]foo<p>extra",
     [["indent",""]],
-    "<blockquote>[]foo</blockquote><p>extra</p>",
+    ["<blockquote>[]foo</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[]foo</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[]<p>extra",
     [["indent",""]],
-    "<blockquote>foo[]</blockquote><p>extra</p>",
+    ["<blockquote>foo[]</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[]</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[]foo<p>extra",
     [["indent",""]],
-    "<blockquote><p>[]foo</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[]foo</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[]foo</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo[]<p>extra",
     [["indent",""]],
-    "<blockquote><p>foo[]</p></blockquote><p>extra</p>",
+    ["<blockquote><p>foo[]</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>{}<br>foo</p><p>extra",
     [["indent",""]],
-    "<blockquote>{}<br></blockquote><p>foo</p><p>extra</p>",
+    ["<blockquote>{}<br></blockquote><p>foo</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">{}<br></blockquote><p>foo</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<br>{}</p><p>extra",
     [["indent",""]],
-    "<blockquote><p>foo{}</p></blockquote><p>extra</p>",
+    ["<blockquote><p>foo{}</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo{}</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<span>{}<br>foo</span>bar<p>extra",
     [["indent",""]],
-    "<blockquote>{}<br></blockquote><span>foo</span>bar<p>extra</p>",
+    ["<blockquote>{}<br></blockquote><span>foo</span>bar<p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">{}<br></blockquote><span>foo</span>bar<p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<span>foo<br>{}</span>bar<p>extra",
     [["indent",""]],
-    "<span>foo{}</span><blockquote>bar</blockquote><p>extra</p>",
+    ["<span>foo{}</span><blockquote>bar</blockquote><p>extra</p>",
+     "<span>foo{}</span><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">bar</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo</p>{}<p>bar</p>",
@@ -102,187 +121,224 @@ var browserTests = [
     {"indent":[false,false,"",false,false,""]}],
 ["<table><tbody><tr><td>foo<td>b[a]r<td>baz</table><p>extra",
     [["indent",""]],
-    "<table><tbody><tr><td>foo</td><td><blockquote>b[a]r</blockquote></td><td>baz</td></tr></tbody></table><p>extra</p>",
+    ["<table><tbody><tr><td>foo</td><td><blockquote>b[a]r</blockquote></td><td>baz</td></tr></tbody></table><p>extra</p>",
+     "<table><tbody><tr><td>foo</td><td><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">b[a]r</blockquote></td><td>baz</td></tr></tbody></table><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<table><tbody><tr data-start=1 data-end=2><td>foo<td>bar<td>baz</table><p>extra",
     [["indent",""]],
-    "<table><tbody><tr><td>foo</td>{<td><blockquote>bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>",
+    ["<table><tbody><tr><td>foo</td>{<td><blockquote>bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>",
+     "<table><tbody><tr><td>foo</td>{<td><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<table><tbody><tr data-start=0 data-end=2><td>foo<td>bar<td>baz</table><p>extra",
     [["indent",""]],
-    "<table><tbody><tr>{<td><blockquote>foo</blockquote></td><td><blockquote>bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>",
+    ["<table><tbody><tr>{<td><blockquote>foo</blockquote></td><td><blockquote>bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>",
+     "<table><tbody><tr>{<td><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo</blockquote></td><td><blockquote>bar</blockquote></td>}<td>baz</td></tr></tbody></table><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<td>baz</table><p>extra",
     [["indent",""]],
-    "<blockquote><table><tbody>{<tr><td>foo</td><td>bar</td><td>baz</td></tr>}</tbody></table></blockquote><p>extra</p>",
+    ["<blockquote><table><tbody>{<tr><td>foo</td><td>bar</td><td>baz</td></tr>}</tbody></table></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><table><tbody>{<tr><td>foo</td><td>bar</td><td>baz</td></tr>}</tbody></table></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<table data-start=0 data-end=1><tbody><tr><td>foo<td>bar<td>baz</table><p>extra",
     [["indent",""]],
-    "<blockquote><table>{<tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody>}</table></blockquote><p>extra</p>",
+    ["<blockquote><table>{<tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody>}</table></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><table>{<tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody>}</table></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["{<table><tr><td>foo<td>bar<td>baz</table>}<p>extra",
     [["indent",""]],
-    "<blockquote>{<table><tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody></table>}</blockquote><p>extra</p>",
+    ["<blockquote>{<table><tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody></table>}</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">{<table><tbody><tr><td>foo</td><td>bar</td><td>baz</td></tr></tbody></table>}</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo[bar]</p><p>baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><p>foo[bar]</p></blockquote><p>baz</p><p>extra</p>",
+    ["<blockquote><p>foo[bar]</p></blockquote><p>baz</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foobar</p><p>ba]z</p><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foobar</p><p>ba]z</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foobar</p><p>ba]z</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foobar</p><p>ba]z</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[bar]<br>baz<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar]</blockquote>baz<p>extra</p>",
+    ["<blockquote>foo[bar]</blockquote>baz<p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar]</blockquote>baz<p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[bar]<br><br><br><br>baz<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar]</blockquote><br><br><br>baz<p>extra</p>",
+    ["<blockquote>foo[bar]</blockquote><br><br><br>baz<p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar]</blockquote><br><br><br>baz<p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foobar<br>[ba]z<p>extra",
     [["indent",""]],
-    "foobar<blockquote>[ba]z</blockquote><p>extra</p>",
+    ["foobar<blockquote>[ba]z</blockquote><p>extra</p>",
+     "foobar<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[ba]z</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foobar<br><br><br><br>[ba]z<p>extra",
     [["indent",""]],
-    "foobar<br><br><br><br><blockquote>[ba]z</blockquote><p>extra</p>",
+    ["foobar<br><br><br><br><blockquote>[ba]z</blockquote><p>extra</p>",
+     "foobar<br><br><br><br><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[ba]z</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo[bar<br>ba]z<p>extra",
     [["indent",""]],
-    "<blockquote>foo[bar<br>ba]z</blockquote><p>extra</p>",
+    ["<blockquote>foo[bar<br>ba]z</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo[bar<br>ba]z</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<div>foo<p>[bar]</p>baz</div><p>extra",
     [["indent",""]],
-    "<div>foo<blockquote><p>[bar]</p></blockquote>baz</div><p>extra</p>",
+    ["<div>foo<blockquote><p>[bar]</p></blockquote>baz</div><p>extra</p>",
+     "<div>foo<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"<p>[bar]</p></blockquote>baz</div><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+    ["<blockquote><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+     "<blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><blockquote><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+    ["<blockquote><blockquote><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+     "<blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+    ["<blockquote><blockquote><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+     "<blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo]<blockquote><p>bar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo]</p><p>bar</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo]</p><p>bar</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo]</p><p>bar</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote><p>b]ar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote><p>b]ar</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote><p>bar</blockquote><p>[baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote><p>bar</p><p>[baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote><p>bar</p><p>[baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p><p>[baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote><p>[bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote><blockquote><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote><blockquote><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote><p>bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo</blockquote><p>[bar]<blockquote><p>baz</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>foo</p><p>[bar]</p><p>baz</p></blockquote><p>extra</p>",
+    ["<blockquote><p>foo</p><p>[bar]</p><p>baz</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p><p>[bar]</p><p>baz</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>foo[bar]<br>baz</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote>foo[bar]</blockquote>baz</blockquote><p>extra</p>",
+    ["<blockquote><blockquote>foo[bar]</blockquote>baz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote>foo[bar]</blockquote>baz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>foo[bar<br>b]az</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote>foo[bar<br>b]az</blockquote></blockquote><p>extra</p>",
+    ["<blockquote><blockquote>foo[bar<br>b]az</blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote>foo[bar<br>b]az</blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>foo[bar]</blockquote>baz<p>extra",
     [["indent",""]],
-    "<blockquote><blockquote>foo[bar]</blockquote></blockquote>baz<p>extra</p>",
+    ["<blockquote><blockquote>foo[bar]</blockquote></blockquote>baz<p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote>foo[bar]</blockquote></blockquote>baz<p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>foo[bar</blockquote>b]az<p>extra",
     [["indent",""]],
-    "<blockquote><blockquote>foo[bar</blockquote>b]az</blockquote><p>extra</p>",
+    ["<blockquote><blockquote>foo[bar</blockquote>b]az</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote>foo[bar</blockquote>b]az</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["[foo]<blockquote>bar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote>[foo]<br>bar</blockquote><p>extra</p>",
+    ["<blockquote>[foo]<br>bar</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[foo]<br>bar</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["[foo<blockquote>b]ar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote>[foo<blockquote>b]ar</blockquote></blockquote><p>extra</p>",
+    ["<blockquote>[foo<blockquote>b]ar</blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[foo<blockquote>b]ar</blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["foo<blockquote>bar</blockquote>[baz]<p>extra",
     [["indent",""]],
-    "foo<blockquote>bar<br>[baz]</blockquote><p>extra</p>",
+    ["foo<blockquote>bar<br>[baz]</blockquote><p>extra</p>",
+     "foo<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">bar<br>[baz]</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["[foo<blockquote>bar</blockquote>baz]<p>extra",
     [["indent",""]],
-    "<blockquote>[foo<blockquote>bar</blockquote>baz]</blockquote><p>extra</p>",
+    ["<blockquote>[foo<blockquote>bar</blockquote>baz]</blockquote><p>extra</p>",
+     "<blockquote>[foo<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">bar</blockquote>baz]</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>foo</blockquote>[bar]<blockquote>baz</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote>foo<br>[bar]<br>baz</blockquote><p>extra</p>",
+    ["<blockquote>foo<br>[bar]<br>baz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo<br>[bar]<br>baz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote style=\"margin-right:0\" dir=\"ltr\"><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+    ["<blockquote style=\"margin-right:0\" dir=\"ltr\"><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin-right:0\" dir=\"ltr\"><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+    ["<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+    ["<blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo]<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>bar</blockquote><p>extra",
@@ -292,7 +348,8 @@ var browserTests = [
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>b]ar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>b]ar</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>bar</blockquote><p>[baz]<p>extra",
@@ -302,12 +359,14 @@ var browserTests = [
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>[bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote style=\"margin-right:0\" dir=\"ltr\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>foo</blockquote><p>[bar]<blockquote style=\"margin-right: 0\" dir=\"ltr\"><p>baz</blockquote><p>extra",
@@ -322,107 +381,128 @@ var browserTests = [
     {"stylewithcss":[false,true,"",false,false,""],"indent":[false,false,"",false,false,""]}],
 ["<p style=\"margin-left: 40px\">foo[bar]</p><p style=\"margin-left: 40px\">baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>",
+    ["<blockquote><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p style=\"margin-left: 40px\">foo[bar</p><p style=\"margin-left: 40px\">b]az</p><p>extra",
     [["indent",""]],
-    "<blockquote><p style=\"margin-left:40px\">foo[bar</p><p style=\"margin-left:40px\">b]az</p></blockquote><p>extra</p>",
+    ["<blockquote><p style=\"margin-left:40px\">foo[bar</p><p style=\"margin-left:40px\">b]az</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p style=\"margin-left:40px\">foo[bar</p><p style=\"margin-left:40px\">b]az</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p style=\"margin-left: 40px\">foo[bar]</p><p>baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p>baz</p><p>extra</p>",
+    ["<blockquote><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p>baz</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p style=\"margin-left:40px\">foo[bar]</p></blockquote><p>baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p style=\"margin-left: 40px\">foo[bar</p><p>b]az</p><p>extra",
     [["indent",""]],
-    "<blockquote><p style=\"margin-left:40px\">foo[bar</p><p>b]az</p></blockquote><p>extra</p>",
+    ["<blockquote><p style=\"margin-left:40px\">foo[bar</p><p>b]az</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p style=\"margin-left:40px\">foo[bar</p><p>b]az</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo]<p style=\"margin-left: 40px\">bar<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo]</p></blockquote><p style=\"margin-left:40px\">bar</p><p>extra</p>",
+    ["<blockquote><p>[foo]</p></blockquote><p style=\"margin-left:40px\">bar</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo]</p></blockquote><p style=\"margin-left:40px\">bar</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<p style=\"margin-left: 40px\">b]ar<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><p style=\"margin-left:40px\">b]ar</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><p style=\"margin-left:40px\">b]ar</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><p style=\"margin-left:40px\">b]ar</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<p style=\"margin-left: 40px\">bar<p>[baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><p style=\"margin-left:40px\">bar</p><blockquote><p>[baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><p style=\"margin-left:40px\">bar</p><blockquote><p>[baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><p style=\"margin-left:40px\">bar</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<p style=\"margin-left: 40px\">[bar<p>baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote><p style=\"margin-left:40px\">[bar</p><p>baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote><p style=\"margin-left:40px\">[bar</p><p>baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p style=\"margin-left:40px\">[bar</p><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<p style=\"margin-left: 40px\">bar<p>baz]<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><p style=\"margin-left:40px\">bar</p><p>baz]</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><p style=\"margin-left:40px\">bar</p><p>baz]</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><p style=\"margin-left:40px\">bar</p><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p style=\"margin-left: 40px\">foo<p>[bar]<p style=\"margin-left: 40px\">baz<p>extra",
     [["indent",""]],
-    "<p style=\"margin-left:40px\">foo</p><blockquote><p>[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>",
+    ["<p style=\"margin-left:40px\">foo</p><blockquote><p>[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>",
+     "<p style=\"margin-left:40px\">foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[bar]</p></blockquote><p style=\"margin-left:40px\">baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+    ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>",
+     "<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote><p>baz</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p><p>b]az</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+    ["<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar]</p></blockquote></blockquote><p>baz</p><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+    ["<blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo[bar</p></blockquote><p>b]az</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo]<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>bar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>b]ar</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>b]ar</p></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>b]ar</p></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>bar</blockquote><p>[baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><blockquote><p>[baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><blockquote><p>[baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>[bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<p>foo</p><blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<p>foo</p><blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<p>foo</p><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>bar</blockquote><p>baz]<p>extra",
     [["indent",""]],
-    "<blockquote><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+    ["<blockquote><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo</p><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>bar</p></blockquote><p>baz]</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>foo</blockquote><p>[bar]<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px\"><p>baz</blockquote><p>extra",
     [["indent",""]],
-    "<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p></blockquote><blockquote><p>[bar]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>baz</p></blockquote><p>extra</p>",
+    ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p></blockquote><blockquote><p>[bar]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>baz</p></blockquote><p>extra</p>",
+     "<blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p></blockquote><blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[bar]</p></blockquote><blockquote class=\"webkit-indent-blockquote\" style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>baz</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote>f[oo<blockquote>b]ar</blockquote></blockquote><p>extra",
     [["indent",""]],
-    "<blockquote><blockquote>f[oo<blockquote>b]ar</blockquote></blockquote></blockquote><p>extra</p>",
+    ["<blockquote><blockquote>f[oo<blockquote>b]ar</blockquote></blockquote></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><blockquote>f[oo<blockquote>b]ar</blockquote></blockquote></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<ol><li>foo<li>[bar]<li>baz</ol>",
@@ -587,12 +667,14 @@ var browserTests = [
     {"indent":[false,false,"",false,false,""]}],
 ["<ol><li>[foo<ol><li>bar</ol><li>baz]</ol><p>extra",
     [["indent",""]],
-    "<blockquote><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>",
+    ["<blockquote><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<ol><li>[foo</li><ol><li>bar</ol><li>baz]</ol><p>extra",
     [["indent",""]],
-    "<blockquote><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>",
+    ["<blockquote><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><ol><li>[foo</li><ol><li>bar</li></ol><li>baz]</li></ol></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<ol><li>[foo]<ol><li>bar</ol>baz</ol>",
@@ -617,37 +699,44 @@ var browserTests = [
     {"indent":[false,false,"",false,false,""]}],
 ["foo<!--bar-->[baz]<p>extra",
     [["indent",""]],
-    "<blockquote>foo<!--bar-->[baz]</blockquote><p>extra</p>",
+    ["<blockquote>foo<!--bar-->[baz]</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">foo<!--bar-->[baz]</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["[foo]<!--bar-->baz<p>extra",
     [["indent",""]],
-    "<blockquote>[foo]<!--bar-->baz</blockquote><p>extra</p>",
+    ["<blockquote>[foo]<!--bar-->baz</blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\">[foo]<!--bar-->baz</blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>foo<!--bar-->{}<p>extra",
     [["indent",""]],
-    "<blockquote><p>foo<!--bar-->{}</p></blockquote><p>extra</p>",
+    ["<blockquote><p>foo<!--bar-->{}</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo<!--bar-->{}</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>{}<!--foo-->bar<p>extra",
     [["indent",""]],
-    "<blockquote><p>{}<!--foo-->bar</p></blockquote><p>extra</p>",
+    ["<blockquote><p>{}<!--foo-->bar</p></blockquote><p>extra</p>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>{}<!--foo-->bar</p></blockquote><p>extra</p>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo</blockquote> <p>[bar]",
     [["indent",""]],
-    "<blockquote><p>foo</p> <p>[bar]</p></blockquote>",
+    ["<blockquote><p>foo</p> <p>[bar]</p></blockquote>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p> <p>[bar]</p></blockquote>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<p>[foo]</p> <blockquote><p>bar</blockquote>",
     [["indent",""]],
-    "<blockquote><p>[foo]</p> <p>bar</p></blockquote>",
+    ["<blockquote><p>[foo]</p> <p>bar</p></blockquote>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>[foo]</p> <p>bar</p></blockquote>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<blockquote><p>foo</blockquote> <p>[bar]</p> <blockquote><p>baz</blockquote>",
     [["indent",""]],
-    "<blockquote><p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>",
+    ["<blockquote><p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>",
+     "<blockquote style=\"margin:0 0 0 40px; border:none; padding:0px\"><p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>"],
     [true],
     {"indent":[false,false,"",false,false,""]}],
 ["<ol><li>foo</li><ol><li>bar</li> </ol><li>[baz]</ol>",
diff --git a/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js
index fca68358623..aa226e185be 100644
--- a/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js
+++ b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js
@@ -66,24 +66,24 @@ decode([0xFE, 0x6D], "\u9FB8", "GB18030-2022 15");
 decode([0xFE, 0x7E], "\u9FB9", "GB18030-2022 16");
 decode([0xFE, 0x90], "\u9FBA", "GB18030-2022 17");
 decode([0xFE, 0xA0], "\u9FBB", "GB18030-2022 18");
-decode([0x82, 0x35, 0x90, 0x37], "\uE81E", "GB18030-2022 19");
-decode([0x82, 0x35, 0x90, 0x38], "\uE826", "GB18030-2022 20");
-decode([0x82, 0x35, 0x90, 0x39], "\uE82B", "GB18030-2022 21");
-decode([0x82, 0x35, 0x91, 0x30], "\uE82C", "GB18030-2022 22");
-decode([0x82, 0x35, 0x91, 0x31], "\uE832", "GB18030-2022 23");
-decode([0x82, 0x35, 0x91, 0x32], "\uE843", "GB18030-2022 24");
-decode([0x82, 0x35, 0x91, 0x33], "\uE854", "GB18030-2022 25");
-decode([0x82, 0x35, 0x91, 0x34], "\uE864", "GB18030-2022 26");
-decode([0x84, 0x31, 0x82, 0x36], "\uE78D", "GB18030-2022 27");
-decode([0x84, 0x31, 0x82, 0x37], "\uE78F", "GB18030-2022 28");
-decode([0x84, 0x31, 0x82, 0x38], "\uE78E", "GB18030-2022 29");
-decode([0x84, 0x31, 0x82, 0x39], "\uE790", "GB18030-2022 30");
-decode([0x84, 0x31, 0x83, 0x30], "\uE791", "GB18030-2022 31");
-decode([0x84, 0x31, 0x83, 0x31], "\uE792", "GB18030-2022 32");
-decode([0x84, 0x31, 0x83, 0x32], "\uE793", "GB18030-2022 33");
-decode([0x84, 0x31, 0x83, 0x33], "\uE794", "GB18030-2022 34");
-decode([0x84, 0x31, 0x83, 0x34], "\uE795", "GB18030-2022 35");
-decode([0x84, 0x31, 0x83, 0x35], "\uE796", "GB18030-2022 36");
+decode([0x82, 0x35, 0x90, 0x37], "\u9FB4", "GB18030-2022 19");
+decode([0x82, 0x35, 0x90, 0x38], "\u9FB5", "GB18030-2022 20");
+decode([0x82, 0x35, 0x90, 0x39], "\u9FB6", "GB18030-2022 21");
+decode([0x82, 0x35, 0x91, 0x30], "\u9FB7", "GB18030-2022 22");
+decode([0x82, 0x35, 0x91, 0x31], "\u9FB8", "GB18030-2022 23");
+decode([0x82, 0x35, 0x91, 0x32], "\u9FB9", "GB18030-2022 24");
+decode([0x82, 0x35, 0x91, 0x33], "\u9FBA", "GB18030-2022 25");
+decode([0x82, 0x35, 0x91, 0x34], "\u9FBB", "GB18030-2022 26");
+decode([0x84, 0x31, 0x82, 0x36], "\uFE10", "GB18030-2022 27");
+decode([0x84, 0x31, 0x82, 0x37], "\uFE11", "GB18030-2022 28");
+decode([0x84, 0x31, 0x82, 0x38], "\uFE12", "GB18030-2022 29");
+decode([0x84, 0x31, 0x82, 0x39], "\uFE13", "GB18030-2022 30");
+decode([0x84, 0x31, 0x83, 0x30], "\uFE14", "GB18030-2022 31");
+decode([0x84, 0x31, 0x83, 0x31], "\uFE15", "GB18030-2022 32");
+decode([0x84, 0x31, 0x83, 0x32], "\uFE16", "GB18030-2022 33");
+decode([0x84, 0x31, 0x83, 0x33], "\uFE17", "GB18030-2022 34");
+decode([0x84, 0x31, 0x83, 0x34], "\uFE18", "GB18030-2022 35");
+decode([0x84, 0x31, 0x83, 0x35], "\uFE19", "GB18030-2022 36");
 
 let i = 0;
 for (const range of ranges) {
diff --git a/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html
index 531d26084e2..dc0dc43468f 100644
--- a/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html
+++ b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html
@@ -43,24 +43,24 @@
  encode("\u9FB9", "%FE~", "GB18030-2022 16");
  encode("\u9FBA", "%FE%90", "GB18030-2022 17");
  encode("\u9FBB", "%FE%A0", "GB18030-2022 18");
- encode("\uE78D", "%841%826", "GB18030-2022 19");
- encode("\uE78E", "%841%828", "GB18030-2022 20");
- encode("\uE78F", "%841%827", "GB18030-2022 21");
- encode("\uE790", "%841%829", "GB18030-2022 22");
- encode("\uE791", "%841%830", "GB18030-2022 23");
- encode("\uE792", "%841%831", "GB18030-2022 24");
- encode("\uE793", "%841%832", "GB18030-2022 25");
- encode("\uE794", "%841%833", "GB18030-2022 26");
- encode("\uE795", "%841%834", "GB18030-2022 27");
- encode("\uE796", "%841%835", "GB18030-2022 28");
- encode("\uE81E", "%825%907", "GB18030-2022 29");
- encode("\uE826", "%825%908", "GB18030-2022 30");
- encode("\uE82B", "%825%909", "GB18030-2022 31");
- encode("\uE82C", "%825%910", "GB18030-2022 32");
- encode("\uE832", "%825%911", "GB18030-2022 33");
- encode("\uE843", "%825%912", "GB18030-2022 34");
- encode("\uE854", "%825%913", "GB18030-2022 35");
- encode("\uE864", "%825%914", "GB18030-2022 36");
+ encode("\uE78D", "%A6%D9", "GB18030-2022 19");
+ encode("\uE78E", "%A6%DA", "GB18030-2022 20");
+ encode("\uE78F", "%A6%DB", "GB18030-2022 21");
+ encode("\uE790", "%A6%DC", "GB18030-2022 22");
+ encode("\uE791", "%A6%DD", "GB18030-2022 23");
+ encode("\uE792", "%A6%DE", "GB18030-2022 24");
+ encode("\uE793", "%A6%DF", "GB18030-2022 25");
+ encode("\uE794", "%A6%EC", "GB18030-2022 26");
+ encode("\uE795", "%A6%ED", "GB18030-2022 27");
+ encode("\uE796", "%A6%F3", "GB18030-2022 28");
+ encode("\uE81E", "%FEY", "GB18030-2022 29");
+ encode("\uE826", "%FEa", "GB18030-2022 30");
+ encode("\uE82B", "%FEf", "GB18030-2022 31");
+ encode("\uE82C", "%FEg", "GB18030-2022 32");
+ encode("\uE832", "%FEm", "GB18030-2022 33");
+ encode("\uE843", "%FE~", "GB18030-2022 34");
+ encode("\uE854", "%FE%90", "GB18030-2022 35");
+ encode("\uE864", "%FE%A0", "GB18030-2022 36");
 
  const upperCaseNibble = x => {
    return Math.floor(x).toString(16).toUpperCase();
diff --git a/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js
index c0221480da1..b7f1ca9c51e 100644
--- a/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js
+++ b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js
@@ -1,3 +1,5 @@
+// Additional tests can be found in ../gb18030/gb18030-decoder.any.js
+
 const gbkPointers = [
     6432, 7533, 7536, 7672, 7673, 7674, 7675, 7676, 7677, 7678, 7679, 7680, 7681, 7682, 7683, 7684,
     23766, 23770, 23771, 23772, 23773, 23774, 23776, 23777, 23778, 23779, 23780, 23781, 23782, 23784, 23785, 23786,
diff --git a/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html
index e43cb73fea7..11557242e3d 100644
--- a/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html
+++ b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html
@@ -23,4 +23,43 @@
  encode("\u00A5", "%26%23165%3B", "legacy WebKit case 1");
  encode("\u22EF", "%26%238943%3B", "legacy WebKit case 2");
  encode("\u301C", "%26%2312316%3B", "legacy WebKit case 3");
+ encode("\u{10FFFF}", "%26%231114111%3B", "U+10FFFF");
+
+  // GB18030-2022
+ encode("\uFE10", "%A6%D9", "GB18030-2022 1");
+ encode("\uFE12", "%A6%DA", "GB18030-2022 2");
+ encode("\uFE11", "%A6%DB", "GB18030-2022 3");
+ encode("\uFE13", "%A6%DC", "GB18030-2022 4");
+ encode("\uFE14", "%A6%DD", "GB18030-2022 5");
+ encode("\uFE15", "%A6%DE", "GB18030-2022 6");
+ encode("\uFE16", "%A6%DF", "GB18030-2022 7");
+ encode("\uFE17", "%A6%EC", "GB18030-2022 8");
+ encode("\uFE18", "%A6%ED", "GB18030-2022 9");
+ encode("\uFE19", "%A6%F3", "GB18030-2022 10");
+ encode("\u9FB4", "%FEY", "GB18030-2022 11");
+ encode("\u9FB5", "%FEa", "GB18030-2022 12");
+ encode("\u9FB6", "%FEf", "GB18030-2022 13");
+ encode("\u9FB7", "%FEg", "GB18030-2022 14");
+ encode("\u9FB8", "%FEm", "GB18030-2022 15");
+ encode("\u9FB9", "%FE~", "GB18030-2022 16");
+ encode("\u9FBA", "%FE%90", "GB18030-2022 17");
+ encode("\u9FBB", "%FE%A0", "GB18030-2022 18");
+ encode("\uE78D", "%A6%D9", "GB18030-2022 19");
+ encode("\uE78E", "%A6%DA", "GB18030-2022 20");
+ encode("\uE78F", "%A6%DB", "GB18030-2022 21");
+ encode("\uE790", "%A6%DC", "GB18030-2022 22");
+ encode("\uE791", "%A6%DD", "GB18030-2022 23");
+ encode("\uE792", "%A6%DE", "GB18030-2022 24");
+ encode("\uE793", "%A6%DF", "GB18030-2022 25");
+ encode("\uE794", "%A6%EC", "GB18030-2022 26");
+ encode("\uE795", "%A6%ED", "GB18030-2022 27");
+ encode("\uE796", "%A6%F3", "GB18030-2022 28");
+ encode("\uE81E", "%FEY", "GB18030-2022 29");
+ encode("\uE826", "%FEa", "GB18030-2022 30");
+ encode("\uE82B", "%FEf", "GB18030-2022 31");
+ encode("\uE82C", "%FEg", "GB18030-2022 32");
+ encode("\uE832", "%FEm", "GB18030-2022 33");
+ encode("\uE843", "%FE~", "GB18030-2022 34");
+ encode("\uE854", "%FE%90", "GB18030-2022 35");
+ encode("\uE864", "%FE%A0", "GB18030-2022 36");
 </script>
diff --git a/tests/wpt/tests/fedcm/fedcm-abort-silent-mediation-not-permitted.https.html b/tests/wpt/tests/fedcm/fedcm-abort-silent-mediation-not-permitted.https.html
new file mode 100644
index 00000000000..63c49c68ce4
--- /dev/null
+++ b/tests/wpt/tests/fedcm/fedcm-abort-silent-mediation-not-permitted.https.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<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 type="module">
+import {fedcm_test,
+        fedcm_get_and_select_first_account,
+        request_options_with_mediation_required} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let controller = new AbortController();
+  let test_options = request_options_with_mediation_required();
+  test_options.signal = controller.signal;
+  test_options.mediation = "silent";
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  controller.abort();
+  return promise_rejects_dom(t, 'NetworkError', cred);
+}, "Test the abort signal when request fails due to silent mediation being disallowed");
+</script>
diff --git a/tests/wpt/tests/fetch/api/request/request-constructor-init-body-override.any.js b/tests/wpt/tests/fetch/api/request/request-constructor-init-body-override.any.js
index 27bb991871a..c2bbf86f304 100644
--- a/tests/wpt/tests/fetch/api/request/request-constructor-init-body-override.any.js
+++ b/tests/wpt/tests/fetch/api/request/request-constructor-init-body-override.any.js
@@ -18,4 +18,20 @@ promise_test(async function () {
         "req2",
         "The body of the second request should be overridden to 'req2'."
     );
+
 }, "Check that the body of a new request can be overridden when created from an existing Request object");
+
+promise_test(async function () {
+    const req1 = new Request("https://example.com/", {
+        body: "req1",
+        method: "POST",
+    });
+
+    const req2 = new Request("https://example.com/", req1);
+    const bodyText = await req2.text();
+    assert_equals(
+        bodyText,
+        "req1",
+        "The body of the second request should be the same as the first."
+    );
+}, "Check that the body of a new request can be duplicated from an existing Request object");
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
index f9a58d457fc..256921f397e 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="/IndexedDB/resources/support-promises.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-IndexedDB.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
index 3981372df03..a41b519a9d0 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
@@ -9,6 +9,6 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
index b872839f2a8..6e82dfb7e29 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
@@ -10,7 +10,7 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-Error.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
index 3ec98c86c0c..f00d64b45fb 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
index 359f11cd171..4e0e56de753 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
index af0d6169095..b56fb58fe35 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
@@ -6,10 +6,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script
+  src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
index 1581a645a5b..c6b4e2e942e 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-frames.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-frames.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
index 21fd7cb2746..b5cb47c6fda 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-windows.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-windows.js"></script>
diff --git a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
index f30ecddd9af..e39dcc22f0f 100644
--- a/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
+++ b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
@@ -6,10 +6,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script
+  src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-workers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-workers.js"></script>
diff --git a/tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js b/tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js
index 4bb9793085a..a4c0b8bdd39 100644
--- a/tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js
+++ b/tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js
@@ -31,15 +31,37 @@ const directory_promise = (async () => {
   return entries;
 })();
 
+async function cleanupDirectory(dir, ignoreRejections) {
+  // Get a snapshot of the entries.
+  const entries = await Array.fromAsync(dir.values());
+
+  // Call removeEntry on all of them.
+  const remove_entry_promises = entries.map(
+      entry =>
+          dir.removeEntry(entry.name, {recursive: entry.kind === 'directory'}));
+
+  // Wait for them all to resolve or reject.
+  if (ignoreRejections) {
+    await Promise.allSettled(remove_entry_promises);
+  } else {
+    await Promise.all(remove_entry_promises);
+  }
+}
+
 function directory_test(func, description) {
   promise_test(async t => {
     const directory = await directory_promise;
-    // To be resilient against tests not cleaning up properly, cleanup before
-    // every test.
-    for await (let entry of directory.values()) {
-      await directory.removeEntry(
-          entry.name, {recursive: entry.kind === 'directory'});
-    }
+
+    // To be extra resilient against bad tests, cleanup before every test.
+    await cleanupDirectory(directory, /*ignoreRejections=*/ false);
+
+    // Cleanup after every test.
+    t.add_cleanup(async () => {
+      // Ignore any rejections since other cleanup code may have deleted them
+      // before we could.
+      await cleanupDirectory(directory, /*ignoreRejections=*/ true);
+    });
+
     await func(t, directory);
   }, description);
 }
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 c534a8a6c62..0bffebfeb94 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
@@ -255,7 +255,10 @@ BA.decodeInterestGroupData = async function(igData) {
   assert_equals(header.version, 0);
 
   // Test config uses keyId = 0x12 only
-  assert_equals(header.keyId, 0x12);
+  // 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");
 
   // Current cipher config.
   assert_equals(header.kemId, hpke.KemId.DhkemX25519HkdfSha256);
diff --git a/tests/wpt/tests/fledge/tentative/server-response.https.window.js b/tests/wpt/tests/fledge/tentative/server-response.https.window.js
index 3e1011d4229..9c2096ee3d7 100644
--- a/tests/wpt/tests/fledge/tentative/server-response.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/server-response.https.window.js
@@ -8,8 +8,17 @@
 // META: variant=?1-4
 // META: variant=?5-8
 // META: variant=?9-12
+// META: variant=?13-16
+// META: variant=?17-20
+// META: variant=?21-24
+// META: variant=?25-28
+// META: variant=?29-32
+// META: variant=?33-36
+// META: variant=?37-40
+// META: variant=?41-44
+// META: variant=?45-48
 
-// These tests focus on the serverResponse field in AuctinConfig, e.g.
+// These tests focus on the serverResponse field in AuctionConfig, e.g.
 // auctions involving bidding and auction services.
 
 subsetTest(promise_test, async test => {
@@ -402,3 +411,492 @@ subsetTest(promise_test, async test => {
   });
   expectNoWinner(auctionResult);
 }, 'Basic B&A auction - Wrong request Id');
+
+// Runs responseMutator on a minimal correct server response, and expects
+// either success/failure based on expectWin.
+async function testWithMutatedServerResponse(test, expectWin, responseMutator,
+                                             igMutator = undefined) {
+  const uuid = generateUuid(test);
+  const adA = createTrackerURL(window.location.origin, uuid, 'track_get', 'a');
+  const adB = createTrackerURL(window.location.origin, uuid, 'track_get', 'b');
+  const adsArray =
+      [{renderURL: adA, adRenderId: 'a'}, {renderURL: adB, adRenderId: 'b'}];
+  let ig = {ads: adsArray};
+  if (igMutator) {
+    igMutator(ig);
+  }
+  await joinInterestGroup(test, uuid, ig);
+
+  const result = await navigator.getInterestGroupAdAuctionData(
+      {seller: window.location.origin});
+  assert_true(result.requestId !== null);
+  assert_true(result.request.length > 0);
+
+  let decoded = await BA.decodeInterestGroupData(result.request);
+
+  let serverResponseMsg = {
+    'biddingGroups': {},
+    'adRenderURL': adsArray[0].renderURL,
+    'interestGroupName': DEFAULT_INTEREST_GROUP_NAME,
+    'interestGroupOwner': window.location.origin,
+  };
+  serverResponseMsg.biddingGroups[window.location.origin] = [0];
+  await responseMutator(serverResponseMsg);
+
+  let serverResponse =
+      await BA.encodeServerResponse(serverResponseMsg, decoded);
+
+  let hashString = await BA.payloadHash(serverResponse);
+  await BA.authorizeServerResponseHashes([hashString]);
+
+  let auctionResult = await navigator.runAdAuction({
+    'seller': window.location.origin,
+    'interestGroupBuyers': [window.location.origin],
+    'requestId': result.requestId,
+    'serverResponse': serverResponse,
+    'resolveToConfig': true,
+  });
+  if (expectWin) {
+    expectSuccess(auctionResult);
+    return auctionResult;
+  } else {
+    expectNoWinner(auctionResult);
+  }
+}
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false, msg => {msg.error = {}});
+}, 'Basic B&A auction - response marked as error');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ true, msg => {
+    msg.error = 4;
+  });
+}, 'Basic B&A auction - nonsense error field');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.error = {message: 'oh no'};
+  });
+}, 'Basic B&A auction - response marked as error, with message');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.error = {message: {}};
+  });
+}, 'Basic B&A auction - response marked as error, with bad message');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false, msg => {msg.isChaff = true});
+}, 'Basic B&A auction - response marked as chaff');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ true, msg => {msg.isChaff = false});
+}, 'Basic B&A auction - response marked as non-chaff');
+
+// Disabled while spec clarifying expected behavior is in-progress.
+//
+// subsetTest(promise_test, async test => {
+//   await testWithMutatedServerResponse(
+//       test, /*expectSuccess=*/ true, msg => {msg.isChaff = 'yes'});
+// }, 'Basic B&A auction - response marked as chaff incorrectly');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false,
+      msg => {msg.topLevelSeller = 'https://example.org/'});
+}, 'Basic B&A auction - incorrectly includes topLevelSeller');
+
+// Disabled while spec clarifying expected behavior is in-progress.
+//
+// subsetTest(promise_test, async test => {
+//   await testWithMutatedServerResponse(
+//       test, /*expectSuccess=*/ true, msg => {msg.topLevelSeller = 1});
+// }, 'Basic B&A auction - non-string top-level seller ignored');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false,
+      msg => {msg.topLevelSeller = 'http://example.org/'});
+}, 'Basic B&A auction - http:// topLevelSeller is bad, too');
+
+// Disabled while spec clarifying expected behavior is in-progress.
+//
+// subsetTest(promise_test, async test => {
+//   await testWithMutatedServerResponse(
+//       test, /*expectSuccess=*/ true, msg => {msg.bid = '10 cents'});
+// }, 'Basic B&A auction - non-number bid is ignored');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ true, msg => {msg.bid = 50});
+}, 'Basic B&A auction - positive bid is good');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false, msg => {msg.bid = -50});
+}, 'Basic B&A auction - negative bid is bad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false, msg => {msg.bid = 0});
+}, 'Basic B&A auction - zero bid is bad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false,
+      msg => {msg.biddingGroups[window.location.origin] = []});
+}, 'Basic B&A auction - winning group did not bid');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false,
+      msg => {msg.biddingGroups[window.location.origin] = [-1, 0]});
+}, 'Basic B&A auction - negative bidding group index');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false,
+      msg => {msg.biddingGroups[window.location.origin] = [0, 1]});
+}, 'Basic B&A auction - too large bidding group index');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.interestGroupName += 'not';
+  });
+}, 'Basic B&A auction - wrong IG name');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(
+      test, /*expectSuccess=*/ false, async msg => {
+        await leaveInterestGroup();
+      });
+}, 'Basic B&A auction - left IG in the middle');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.adRenderURL += 'not';
+  });
+}, 'Basic B&A auction - ad URL not in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.buyerReportingId = 'bid1';
+  });
+}, 'Basic B&A auction - buyerReportingId not in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ true, msg => {
+    msg.buyerReportingId = 'bid1';
+  }, ig => {
+    ig.ads[0].buyerReportingId = 'bid1';
+    ig.ads[1].buyerReportingId = 'bid2';
+  });
+}, 'Basic B&A auction - buyerReportingId in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.buyerReportingId = 'bid2';
+  }, ig => {
+    ig.ads[0].buyerReportingId = 'bid1';
+    ig.ads[1].buyerReportingId = 'bid2';
+  });
+}, 'Basic B&A auction - buyerReportingId in wrong ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.buyerAndSellerReportingId = 'bsid1';
+  });
+}, 'Basic B&A auction - buyerAndSellerReportingId not in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ true, msg => {
+    msg.buyerAndSellerReportingId = 'bsid1';
+  }, ig => {
+    ig.ads[0].buyerAndSellerReportingId = 'bsid1';
+    ig.ads[1].buyerAndSellerReportingId = 'bsid2';
+  });
+}, 'Basic B&A auction - buyerAndSellerReportingId in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.buyerAndSellerReportingId = 'bsid2';
+  }, ig => {
+    ig.ads[0].buyerAndSellerReportingId = 'bsid1';
+    ig.ads[1].buyerAndSellerReportingId = 'bsid2';
+  });
+}, 'Basic B&A auction - buyerAndSellerReportingId in wrong ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.components = ["https://example.org"];
+  });
+}, 'Basic B&A auction - ad component URL not in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ true, msg => {
+    msg.components = ['https://example.org'];
+  }, ig => {
+    ig.adComponents = [{renderURL: 'https://example.org/'}];
+  });
+}, 'Basic B&A auction - ad component URL in ad');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ false, msg => {
+    msg.bidCurrency = 'cents';
+  });
+}, 'Basic B&A auction - invalid ad currency');
+
+subsetTest(promise_test, async test => {
+  await testWithMutatedServerResponse(test, /*expectSuccess=*/ true, msg => {
+    msg.bidCurrency = 'USD';
+  });
+}, 'Basic B&A auction - valid ad currency');
+
+// Runs whatever is set in `mutators` on a minimal correct hybrid B&A/local
+// auction, and expects either the B&A bid or local bid to win depending on
+// expectBaWin.
+async function testHybridAuctionWithMutatedServerResponse(
+    test, expectBaWin, mutators = {
+      responseMutator: undefined,
+      igMutator: undefined,
+      auctionConfigMutator: undefined,
+      expectUrlsMutator: undefined
+    }) {
+  const uuid = generateUuid(test);
+  const adA = createTrackerURL(window.location.origin, uuid, 'track_get', 'a');
+  const adB = createTrackerURL(window.location.origin, uuid, 'track_get', 'b');
+  const adsArray =
+      [{renderURL: adA, adRenderId: 'a'}, {renderURL: adB, adRenderId: 'b'}];
+  let interestGroup = {
+    ads: adsArray,
+    biddingLogicURL: createBiddingScriptURL({allowComponentAuction: true})
+  };
+  if (mutators.igMutator) {
+    mutators.igMutator(interestGroup, uuid);
+  }
+  await joinInterestGroup(test, uuid, interestGroup);
+
+  const result = await navigator.getInterestGroupAdAuctionData(
+      {seller: window.location.origin});
+  assert_true(result.requestId !== null);
+  assert_true(result.request.length > 0);
+
+  let decoded = await BA.decodeInterestGroupData(result.request);
+
+  // The server-side auction uses a bid of 10, for second ad, so it should
+  // win over the client-side component auctions bid of 9 (unless something
+  // mutators did made the server response unacceptable).
+  let serverResponseMsg = {
+    'biddingGroups': {},
+    'adRenderURL': adsArray[1].renderURL,
+    'interestGroupName': DEFAULT_INTEREST_GROUP_NAME,
+    'interestGroupOwner': window.location.origin,
+    'topLevelSeller': window.location.origin,
+    'bid': 10,
+  };
+  serverResponseMsg.biddingGroups[window.location.origin] = [0];
+  if (mutators.responseMutator) {
+    mutators.responseMutator(serverResponseMsg, uuid);
+  }
+
+  let serverResponse =
+      await BA.encodeServerResponse(serverResponseMsg, decoded);
+
+  let hashString = await BA.payloadHash(serverResponse);
+  await BA.authorizeServerResponseHashes([hashString]);
+
+  let auctionConfig = {
+    seller: window.location.origin,
+    decisionLogicURL: createDecisionScriptURL(uuid),
+    interestGroupBuyers: [],
+    resolveToConfig: true,
+    componentAuctions: [
+      {
+        seller: window.location.origin,
+        decisionLogicURL: createDecisionScriptURL(uuid),
+        interestGroupBuyers: [window.location.origin],
+      },
+      {
+        seller: window.location.origin,
+        requestId: result.requestId,
+        serverResponse: serverResponse,
+      }
+    ]
+  };
+  if (mutators.auctionConfigMutator) {
+    mutators.auctionConfigMutator(auctionConfig, uuid);
+  }
+
+  let auctionResult = await navigator.runAdAuction(auctionConfig);
+  expectSuccess(auctionResult);
+  createAndNavigateFencedFrame(test, auctionResult);
+  let expectUrls = expectBaWin ? [adB] : [adA];
+  if (mutators.expectUrlsMutator) {
+    mutators.expectUrlsMutator(expectUrls, uuid);
+  }
+  await waitForObservedRequests(uuid, expectUrls);
+}
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ false, {
+        responseMutator: (response) => {
+          delete response.topLevelSeller;
+        }
+      });
+}, 'Hybrid B&A auction --- missing top-level seller');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ false, {
+        responseMutator: (response) => {
+          response.topLevelSeller = 'https://www.example.org/';
+        }
+      });
+}, 'Hybrid B&A auction --- wrong top-level seller');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ false, {
+        responseMutator: (response) => {
+          delete response.bid;
+        }
+      });
+}, 'Hybrid B&A auction --- no bid');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ true, {
+        responseMutator: (response) => {
+          response.bidCurrency = 'USD';
+        }
+      });
+}, 'Hybrid B&A auction --- currency check --- nothing configured');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ false, {
+        responseMutator: (response) => {
+          response.bidCurrency = 'USD';
+        },
+        auctionConfigMutator: (auctionConfig) => {
+          auctionConfig.componentAuctions[1].sellerCurrency = 'EUR';
+        }
+      });
+}, 'Hybrid B&A auction --- sellerCurrency mismatch');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ true, {
+        auctionConfigMutator: (auctionConfig) => {
+          auctionConfig.componentAuctions[1].sellerCurrency = 'EUR';
+        }
+      });
+}, 'Hybrid B&A auction --- sellerCurrency config, no bidCurrency');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ false, {
+        responseMutator: (response) => {
+          response.bidCurrency = 'USD';
+        },
+        auctionConfigMutator: (auctionConfig) => {
+          auctionConfig.perBuyerCurrencies = {};
+          auctionConfig.perBuyerCurrencies[window.location.origin] = 'EUR';
+        }
+      });
+}, 'Hybrid B&A auction --- top perBuyerCurrencies mismatch');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ true, {
+        auctionConfigMutator: (auctionConfig) => {
+          auctionConfig.perBuyerCurrencies = {};
+          auctionConfig.perBuyerCurrencies[window.location.origin] = 'EUR';
+        }
+      });
+}, 'Hybrid B&A auction --- perBuyerCurrencies config, no bidCurrency');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ true, {
+        responseMutator: (response) => {
+          response.bidCurrency = 'USD';
+          response.bid = 50;
+          response.adMetadata = '[1, "hello"]';
+        },
+        auctionConfigMutator: (auctionConfig, uuid) => {
+          let trackTopSeller = createSellerReportURL(uuid, 'top');
+          auctionConfig.decisionLogicURL = createDecisionScriptURL(uuid, {
+            // Note: this will throw on the local bid as well as an incorrect
+            // server bid.
+            scoreAd: `
+              let origin = '${window.location.origin}';
+              if (!(adMetadata instanceof Array) ||
+                  adMetadata.length !== 2 ||
+                  adMetadata[0] !== 1 ||
+                  adMetadata[1] !== 'hello') {
+                throw 'bad adMetadata ' + JSON.stringify(adMetadata);
+              }
+              if (bid !== 50)
+                throw 'bad bid ' + bid;
+              if (browserSignals.bidCurrency !== 'USD')
+                throw 'bad currency ' + browserSignals.bidCurrency;
+              if (browserSignals.interestGroupOwner != origin)
+                throw 'bad IG owner ' + browserSignals.interestGroupOwner;
+              if (browserSignals.componentSeller != origin) {
+                throw 'bad component seller ' +
+                    browserSignals.interestGroupOwner;
+              }`
+          });
+        }
+      });
+}, 'Hybrid B&A auction --- bid info passed to top-level scoreAd');
+
+subsetTest(promise_test, async test => {
+  await testHybridAuctionWithMutatedServerResponse(
+      test, /*expectBaWin=*/ true, {
+        responseMutator: (response) => {
+          response.bidCurrency = 'USD';
+          response.bid = 50;
+          response.buyerAndSellerReportingId = 'bsid2';
+        },
+        igMutator: (ig) => {
+          ig.ads[0].buyerAndSellerReportingId = 'bsid1';
+          ig.ads[1].buyerAndSellerReportingId = 'bsid2';
+        },
+        auctionConfigMutator: (auctionConfig, uuid) => {
+          let trackTopSeller = createSellerReportURL(uuid, 'top');
+          auctionConfig.decisionLogicURL = createDecisionScriptURL(uuid, {
+            reportResult: `sendReportTo("${trackTopSeller}&" +
+                browserSignals.bid + '&' +
+                browserSignals.buyerAndSellerReportingId)`
+          });
+        },
+        expectUrlsMutator: (expectUrls, uuid) => {
+          expectUrls.push(createSellerReportURL(uuid, 'top') + '&50&bsid2');
+        }
+      });
+}, 'Hybrid B&A auction --- bid info passed to top-level reporting');
+
+/* Some things that are not currently tested that probably should be; this is
+   not exhaustive, merely to keep track of things that come to mind as tests are
+   written:
+
+   - Reporting event/beacon operation.
+
+   - Actually loading component ad --- see stuff in components-ads.https...
+     for examples.
+
+   - Check that topLevelSellerReportingURLs doesn't do anything in a component
+     auction? The code is actually a little suspect; need to check the spec
+     at any rate.
+
+   - forDebugOnly diff between server_filtered or not (and also componentWin)?
+     forDebugOnly in general may be too hard to test given sampling. I should
+     probably ask Qingxin for his opinion.
+*/
diff --git a/tests/wpt/tests/fs/resources/messaging-blob-helpers.js b/tests/wpt/tests/fs/resources/messaging-blob-helpers.js
index 852f2e2d321..a95d13f2d72 100644
--- a/tests/wpt/tests/fs/resources/messaging-blob-helpers.js
+++ b/tests/wpt/tests/fs/resources/messaging-blob-helpers.js
@@ -21,19 +21,21 @@ async function create_message_target_data_uri(test) {
 // Enables the creation of blob URLs, data URIs and iframe srcdocs re-using
 // the contents of 'message-target.html'.
 async function create_message_target_html_without_subresources(test) {
-  const test_helpers_script = await fetch_text('resources/test-helpers.js');
+  const test_helpers_script =
+      await fetch_text('../fs/resources/test-helpers.js');
 
   const messaging_helpers_script =
-    await fetch_text('resources/messaging-helpers.js');
+      await fetch_text('../fs/resources/messaging-helpers.js');
 
   const messaging_serialize_helpers_script =
-    await fetch_text('resources/messaging-serialize-helpers.js');
+      await fetch_text('../fs/resources/messaging-serialize-helpers.js');
 
   const message_target_script =
-    await fetch_text('resources/message-target.js');
+      await fetch_text('../fs/resources/message-target.js');
 
   // Get the inline script code from 'message-target.html'.
-  const iframe = await add_iframe(test, { src: 'resources/message-target.html' });
+  const iframe =
+      await add_iframe(test, {src: '../fs/resources/message-target.html'});
   const iframe_script =
     iframe.contentWindow.document.getElementById('inline_script').outerHTML;
   iframe.remove();
diff --git a/tests/wpt/tests/fs/resources/messaging-helpers.js b/tests/wpt/tests/fs/resources/messaging-helpers.js
index 776c0c50d56..300412a693d 100644
--- a/tests/wpt/tests/fs/resources/messaging-helpers.js
+++ b/tests/wpt/tests/fs/resources/messaging-helpers.js
@@ -6,12 +6,13 @@
 
 // Define the URL constants used for each type of message target, including
 // iframes and workers.
-const kDocumentMessageTarget = 'resources/message-target.html';
-const kSharedWorkerMessageTarget = 'resources/message-target-shared-worker.js';
+const kDocumentMessageTarget = '../fs/resources/message-target.html';
+const kSharedWorkerMessageTarget =
+    '../fs/resources/message-target-shared-worker.js';
 const kServiceWorkerMessageTarget =
-  'resources/message-target-service-worker.js';
+    '../fs/resources/message-target-service-worker.js';
 const kDedicatedWorkerMessageTarget =
-  'resources/message-target-dedicated-worker.js';
+    '../fs/resources/message-target-dedicated-worker.js';
 
 function create_dedicated_worker(test, url) {
   const dedicated_worker = new Worker(url);
diff --git a/tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js b/tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js
index 400b2c507b7..679f409ca90 100644
--- a/tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js
+++ b/tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js
@@ -11,18 +11,38 @@ function getFileSystemType() {
   return 'sandboxed';
 }
 
-async function cleanupSandboxedFileSystem() {
-  const dir = await navigator.storage.getDirectory();
-  for await (let entry of dir.values())
-    await dir.removeEntry(entry.name, {recursive: entry.kind === 'directory'});
+async function cleanupDirectory(dir, ignoreRejections) {
+  // Get a snapshot of the entries.
+  const entries = await Array.fromAsync(dir.values());
+
+  // Call removeEntry on all of them.
+  const remove_entry_promises = entries.map(
+      entry =>
+          dir.removeEntry(entry.name, {recursive: entry.kind === 'directory'}));
+
+  // Wait for them all to resolve or reject.
+  if (ignoreRejections) {
+    await Promise.allSettled(remove_entry_promises);
+  } else {
+    await Promise.all(remove_entry_promises);
+  }
 }
 
 function directory_test(func, description) {
   promise_test(async t => {
-    // To be extra resilient against bad tests, cleanup before every test.
-    await cleanupSandboxedFileSystem();
-
     const dir = await navigator.storage.getDirectory();
+
+    // To be extra resilient against bad tests, cleanup before every test.
+    await cleanupDirectory(dir, /*ignoreRejections=*/ false);
+
+    // Cleanup after every test.
+    t.add_cleanup(async () => {
+      // Ignore any rejections since other cleanup code may have deleted them
+      // before we could.
+      await cleanupDirectory(dir, /*ignoreRejections=*/ true);
+    });
+
+
     await func(t, dir);
   }, description);
 }
diff --git a/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js
index 9e114619bf2..75cb7bdde8c 100644
--- a/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js
+++ b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js
@@ -121,8 +121,7 @@ directory_test(async (t, root_dir) => {
 }, 'Store handle in IndexedDB using inline keys.');
 
 directory_test(async (t, root_dir) => {
-  const expected_root_name = '';
-  assert_equals(root_dir.name, expected_root_name);
+  const expected_root_name = root_dir.name;
 
   const db = await createDatabase(t, db => {
     const store = db.createObjectStore('store', {keyPath: 'key'});
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html
index bcca5ed90cb..ac0ef4d7aa0 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html
@@ -6,30 +6,31 @@
 <script>
 async_test((t) => {
   let state = "begin"
+  let initialLength = history.length
+
   self[0].frameElement.onload = t.step_func(() => {
     if(state === "b first") {
-      assert_equals(history.length, 2)
+      assert_equals(history.length, initialLength + 1, state)
 
       state = "c first"
       navigateFrameAfterDelay(t, "resources/c.html")
     } else if (state === "c first") {
-      assert_equals(history.length, 3)
+      assert_equals(history.length, initialLength + 2, state)
 
       state = "a second"
       history.back(2)
     } else if (state === "a second") {
-      assert_equals(history.length, 3)
+      assert_equals(history.length, initialLength + 2, state)
 
       state = "a third"
       navigateFrameAfterDelay(t, "resources/a.html")
     } else if (state === "a third") {
-      assert_equals(history.length, 3)
+      assert_equals(history.length, initialLength + 2, state)
       t.done()
     }
   })
   onload = t.step_func(() => {
     assert_equals(state, "begin")
-    assert_equals(history.length, 1)
 
     state = "b first"
 
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py
index 733d36b15ed..c971f8d413b 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py
@@ -24,9 +24,15 @@ def main(request, response):
   start_on = query.get("startOn")
   start_on_s = f"'{start_on[0]}'" if start_on else "null"
 
+  headers = [("Content-Type", "text/html")]
+  # We always permit partitioned popins to be loaded for testing.
+  # See https://explainers-by-googlers.github.io/partitioned-popins/
+  if request.headers.get(b"Sec-Popin-Context") == b"partitioned":
+    headers.append((b'Popin-Policy', b"partitioned=*"))
+
   # This sets a base href so that even if this content e.g. data or blob URLs
   # document, relative URLs will resolve.
-  return (status, [("Content-Type", "text/html")], f"""
+  return (status, headers, f"""
 <!DOCTYPE HTML>
 <base href="{html.escape(request.url)}">
 <script src="/common/dispatcher/dispatcher.js"></script>
diff --git a/tests/wpt/tests/html/canvas/color.window.js b/tests/wpt/tests/html/canvas/color.window.js
new file mode 100644
index 00000000000..fafa19a4b02
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/color.window.js
@@ -0,0 +1,72 @@
+const canvas = document.body.appendChild(document.createElement("canvas"));
+const context = canvas.getContext("2d");
+
+[
+  {
+    "input": "rgb(255, 0, 255)",
+    "output": "#ff00ff"
+  },
+  {
+    "input": "rgba(255, 0, 255, 1)",
+    "output": "#ff00ff"
+  },
+  {
+    "input": "#ff00ffff",
+    "output": "#ff00ff"
+  },
+  {
+    "input": "#ff00ff00",
+    "output": "rgba(255, 0, 255, 0)"
+  },
+  {
+    "input": "rgba(255, 0, 255,    0)",
+    "output": "rgba(255, 0, 255, 0)"
+  },
+  {
+    "input": "color(srgb 1 0 1)",
+    "output": "color(srgb 1 0 1)"
+  },
+  {
+    "input": "color(srgb 1 0 1 / 1)",
+    "output": "color(srgb 1 0 1)"
+  },
+  {
+    "input": "color(srgb 1 0 1/0)",
+    "output": "color(srgb 1 0 1 / 0)"
+  },
+  {
+    "input": "color(srgb 1 none 1)",
+    "output": "color(srgb 1 none 1)"
+  },
+  {
+    "input": "color(srgb none -1 2 / 3)", // alpha is clamped to [0, 1]
+    "output": "color(srgb none -1 2)"
+  },
+  {
+    "input": "color(display-p3 0.96 0.76  \t 0.79)",
+    "output": "color(display-p3 0.96 0.76 0.79)"
+  },
+  {
+    "input": "lab(29% 39 20)",
+    "output": "lab(29 39 20)"
+  },
+  {
+    "input": "transparent",
+    "output": "rgba(0, 0, 0, 0)"
+  },
+  {
+    "input": "rgb(none none none)",
+    "output": "#000000"
+  },
+  {
+    "input": "rgb(300 none 400)",
+    "output": "#ff00ff"
+  }
+].forEach(({ input, output }) => {
+  test(() => {
+    ["fillStyle", "strokeStyle", "shadowColor"].forEach(colorGetterSetter => {
+      context[colorGetterSetter] = input;
+      assert_equals(context[colorGetterSetter], output, colorGetterSetter);
+    });
+  }, `'${input}' should serialize as '${output}'`);
+});
diff --git a/tests/wpt/tests/html/meta/refresh-time.html b/tests/wpt/tests/html/meta/refresh-time.html
index 7aef1266a2b..90e9375879e 100644
--- a/tests/wpt/tests/html/meta/refresh-time.html
+++ b/tests/wpt/tests/html/meta/refresh-time.html
@@ -8,46 +8,40 @@
 
 <body>
 <script>
-  async function sleep(ms, test) {
-    return new Promise(resolve => {test.step_timeout(resolve, ms)});
+  async function measureRefreshTime(src) {
+    const frame = document.createElement("iframe");
+    document.body.appendChild(frame);
+
+    const loadPromise = new Promise(resolve => {
+      frame.addEventListener("load", () => {
+        resolve(performance.now());
+      });
+    });
+    frame.src = src;
+    const startTime = await loadPromise;
+
+    const unloadPromise = new Promise(resolve => {
+      frame.contentWindow.addEventListener("beforeunload", () => {
+        resolve(performance.now());
+      });
+    });
+    const endTime = await unloadPromise;
+    return endTime - startTime;
   }
 
   promise_test(async test => {
-    const frame = document.createElement("iframe");
-    document.body.appendChild(frame);
-    frame.src = "resources/refresh1.html";
-    await sleep(500, test);
-    assert_equals(frame.contentWindow.document.title, "refresh 1");
-    await sleep(1000, test);
-    assert_equals(frame.contentWindow.document.title, "got refreshed");
+    const refreshTime = await measureRefreshTime("resources/refresh1.html");
+    assert_greater_than(refreshTime, 900);
   }, "Ensure that refresh is observed");
 
   promise_test(async test => {
-    const frame = document.createElement("iframe");
-    document.body.appendChild(frame);
-    frame.src = "resources/refresh.99.html";
-    await sleep(500, test);
-    assert_equals(frame.contentWindow.document.title, "got refreshed");
-  }, "Ensure that fractions in refresh time are ignored");
-
-  promise_test(async test => {
-    const frame = document.createElement("iframe");
-    document.body.appendChild(frame);
-    frame.src = "resources/refresh1.99.html";
-    await sleep(500, test);
-    assert_equals(frame.contentWindow.document.title, "refresh 1.99");
-    await sleep(1000, test);
-    assert_equals(frame.contentWindow.document.title, "got refreshed");
+    const refreshTime = await measureRefreshTime("resources/refresh1.99.html");
+    assert_greater_than(refreshTime, 900);
   }, "Ensure that non-fractional part in refresh time does not get discarded");
 
   promise_test(async test => {
-    const frame = document.createElement("iframe");
-    document.body.appendChild(frame);
-    frame.src = "resources/refresh1dotdot5dot.html";
-    await sleep(500, test);
-    assert_equals(frame.contentWindow.document.title, "refresh 1..5.");
-    await sleep(750, test);
-    assert_equals(frame.contentWindow.document.title, "got refreshed");
+    const refreshTime = await measureRefreshTime("resources/refresh1dotdot9dot.html");
+    assert_greater_than(refreshTime, 900);
   }, "Ensure that multiple periods in refresh time just get ignored");
 </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/meta/resources/refresh.99.html b/tests/wpt/tests/html/meta/resources/refresh.99.html
deleted file mode 100644
index ca4e3462772..00000000000
--- a/tests/wpt/tests/html/meta/resources/refresh.99.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>refresh .99</title>
-
-<meta http-equiv="refresh" content=".99;url=gotRefreshed.html">
\ No newline at end of file
diff --git a/tests/wpt/tests/html/meta/resources/refresh1dotdot5dot.html b/tests/wpt/tests/html/meta/resources/refresh1dotdot5dot.html
deleted file mode 100644
index 085b9e9ba71..00000000000
--- a/tests/wpt/tests/html/meta/resources/refresh1dotdot5dot.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>refresh 1..5.</title>
-
-<meta http-equiv="refresh" content="1..5.;url=gotRefreshed.html">
\ No newline at end of file
diff --git a/tests/wpt/tests/html/meta/resources/refresh1dotdot9dot.html b/tests/wpt/tests/html/meta/resources/refresh1dotdot9dot.html
new file mode 100644
index 00000000000..c8af3abbdfc
--- /dev/null
+++ b/tests/wpt/tests/html/meta/resources/refresh1dotdot9dot.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>refresh 1..9.</title>
+
+<meta http-equiv="refresh" content="1..9.;url=gotRefreshed.html">
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-simple-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-simple-crash.html
new file mode 100644
index 00000000000..b0b251438f7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-simple-crash.html
@@ -0,0 +1,5 @@
+<a>
+<p>
+<!--Pass if no crash-->
+<iframe loading="lazy"></iframe>
+<a>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/appearance-base-select-other-elements-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/appearance-base-select-other-elements-ref.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/appearance-base-select-other-elements-ref.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/appearance-base-select-other-elements-ref.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/appearance-base-select-other-elements.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/appearance-base-select-other-elements.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/appearance-base-select-other-elements.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/appearance-base-select-other-elements.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering-ref.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering-ref.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering-ref.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/closed-listbox-rendering.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/nested-options.tenative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/nested-options.tenative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/nested-options.tenative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/nested-options.tenative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/option-computed-style.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-accessibility-minimum-target-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-accessibility-minimum-target-size.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-accessibility-minimum-target-size.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-accessibility-minimum-target-size.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-datalist-options-idl.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-disabled.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-disabled.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-disabled.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-disabled.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-fallback-datalist-animations.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-fallback-datalist-animations.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-fallback-datalist-animations.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-fallback-datalist-animations.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-keyboard-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-keyboard-behavior.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-keyboard-behavior.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-keyboard-behavior.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-mouse-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-mouse-behavior.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-mouse-behavior.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-mouse-behavior.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-option-hover-styles.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-hover-styles.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-option-hover-styles.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-hover-styles.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-size-multiple-new-content-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-size-multiple-new-content-ref.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-size-multiple-new-content-ref.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-size-multiple-new-content-ref.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-size-multiple-new-content.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-size-multiple-new-content.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-size-multiple-new-content.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-size-multiple-new-content.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/selectedoption.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedoption.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/selectedoption.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedoption.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/selectedoptionelement-attr.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedoptionelement-attr.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/switch-picker-appearance.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/switch-picker-appearance.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/switch-picker-appearance.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/switch-picker-appearance.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering-ref.html
deleted file mode 100644
index 61c68160585..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering-ref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-
-<style>
-.border-wrapper {
-  border: 7px solid cornflowerblue;
-  display: inline-block;
-}
-
-select {
-  appearance: base-select;
-}
-</style>
-
-<div class="border-wrapper">
-  <select>
-    <option>Option 1</option>
-  </select>
-</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html
deleted file mode 100644
index 3265143624b..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/border-rendering.tentative.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-
-<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/stylable-select/select-keyboard-hidden-option.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-keyboard-hidden-option.tentative.html
deleted file mode 100644
index b9d7cfbd3c0..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/stylable-select/select-keyboard-hidden-option.tentative.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<link rel=author href="mailto:jarhar@chromium.org">
-<link rel=help href="https://github.com/whatwg/html/issues/9799">
-<link rel=help href="https://issues.chromium.org/issues/360357707">
-<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>
-
-<style>
-select, select::picker(select) {
-  appearance: base-select;
-}
-</style>
-
-<select>
-  <option hidden>hidden one</option>
-  <option class=two>two</option>
-  <option class=three>three</option>
-</select>
-
-<script>
-const ArrowDown = '\uE015';
-
-promise_test(async () => {
-  const select = document.querySelector('select');
-  const hiddenOption = document.querySelector('option[hidden]');
-  const optionTwo = document.querySelector('option.two');
-  const optionThree = document.querySelector('option.three');
-
-  select.focus();
-  await test_driver.send_keys(select, ' ');
-  assert_true(select.matches(':open'),
-    'Select should open after pressing spacebar.');
-
-  assert_equals(document.activeElement, optionTwo,
-    'The first visible <option> should get focused after opening picker.');
-
-  await (new test_driver.Actions()
-    .keyDown(ArrowDown)
-    .keyUp(ArrowDown))
-    .send();
-
-  assert_equals(document.activeElement, optionThree,
-    'The second visible <option> should get focused after arrowdown.');
-}, 'Hidden <option>s should not get initial focus.');
-</script>
diff --git a/tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html
index ee8c34ced31..fb01cc8e609 100644
--- a/tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html
+++ b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html
@@ -30,7 +30,10 @@ fetch("/interfaces/html.idl").then(res => res.text()).then(htmlIDL => {
   const names = globalEventHandlers.members.map(member => member.name).filter(name => name !== "onerror");
 
   for (const name of names) {
-    const withoutOn = name.substring(2);
+    let withoutOn = name.substring(2);
+    if (prefixedAnimationAttributeToEventType.has(withoutOn)) {
+      withoutOn = prefixedAnimationAttributeToEventType.get(withoutOn);
+    }
 
     test(() => {
       for (const location of [window, HTMLElement.prototype, SVGElement.prototype, Document.prototype]) {
@@ -64,22 +67,21 @@ fetch("/interfaces/html.idl").then(res => res.text()).then(htmlIDL => {
       const el = document.createElement("div");
       el.setAttribute(name, `window.${name}Happened2 = true;`);
 
-      let eventType = withoutOn;
-      if (prefixedAnimationAttributeToEventType.has(eventType)) {
-        eventType = prefixedAnimationAttributeToEventType.get(eventType);
-      }
-      el.dispatchEvent(new Event(eventType));
+      el.dispatchEvent(new Event(withoutOn));
 
       assert_true(window[name + "Happened2"], "Dispatching an event must run the code");
     }, `${name}: the content attribute must execute when an event is dispatched`);
 
     test(() => {
       const element = document.createElement("meta");
+      let fired = false;
       element[name] = e => {
         assert_equals(e.currentTarget, element, "The event must be fired at the <meta> element");
+        fired = true;
       };
 
       element.dispatchEvent(new Event(withoutOn));
+      assert_true(fired);
     }, `${name}: dispatching an Event at a <meta> element must trigger element.${name}`);
   }
 
diff --git a/tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js b/tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js
index d7889e230e3..38aede1ce47 100644
--- a/tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js
+++ b/tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js
@@ -57,5 +57,21 @@ function eventHandlerTest(shadowedHandlers, notShadowedHandlers, element) {
         assert_equals(obj3['on' + handler], null, `${des3} should reflect`);
       }, `shadowed ${handler} removal (${des})`);
     });
+
+    shadowedHandlers.forEach(handler => {
+      // Cannot test the error and unhandledrejection events as the test harness listens for those.
+      if (des != "document.body" || handler == "error" || handler == "unhandledrejection") {
+        return;
+      }
+      test(t => {
+        t.add_cleanup(() => {
+          obj1.removeAttribute('on' + handler);
+          window[`on${handler}Happened`] = undefined;
+        });
+        obj1.setAttribute('on' + handler, `window.on${handler}Happened = true`);
+        obj3.dispatchEvent(new Event(handler));
+        assert_true(window[`on${handler}Happened`]);
+      }, `shadowed ${handler} on body fires when event dispatched on window`);
+    });
   }
 }
diff --git a/tests/wpt/tests/interfaces/digital-credentials.idl b/tests/wpt/tests/interfaces/digital-credentials.idl
index a12ce5a2ba2..2207b25dd57 100644
--- a/tests/wpt/tests/interfaces/digital-credentials.idl
+++ b/tests/wpt/tests/interfaces/digital-credentials.idl
@@ -3,21 +3,17 @@
 // (https://github.com/w3c/webref)
 // Source: Digital Credentials (https://wicg.github.io/digital-credentials/)
 
-partial interface Navigator {
-  [SecureContext, SameObject] readonly attribute CredentialsContainer identity;
-};
-
 partial dictionary CredentialRequestOptions {
   DigitalCredentialRequestOptions digital;
 };
 
 dictionary DigitalCredentialRequestOptions {
-  sequence<DigitalCredentialsProvider> providers;
+  sequence<DigitalCredentialsRequest> requests;
 };
 
-dictionary DigitalCredentialsProvider {
+dictionary DigitalCredentialsRequest {
   required DOMString protocol;
-  required object request;
+  required object data;
 };
 
 [Exposed=Window, SecureContext]
diff --git a/tests/wpt/tests/interfaces/mediaqueries-5.idl b/tests/wpt/tests/interfaces/mediaqueries-5.idl
new file mode 100644
index 00000000000..52154c96725
--- /dev/null
+++ b/tests/wpt/tests/interfaces/mediaqueries-5.idl
@@ -0,0 +1,30 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Media Queries Level 5 (https://drafts.csswg.org/mediaqueries-5/)
+
+[Exposed=Window, SecureContext]
+partial interface Navigator {
+  [SameObject] readonly attribute PreferenceManager preferences;
+};
+
+[Exposed=Window, SecureContext]
+interface PreferenceManager {
+  readonly attribute PreferenceObject colorScheme;
+  readonly attribute PreferenceObject contrast;
+  readonly attribute PreferenceObject reducedMotion;
+  readonly attribute PreferenceObject reducedTransparency;
+  readonly attribute PreferenceObject reducedData;
+};
+
+[Exposed=Window, SecureContext]
+interface PreferenceObject : EventTarget {
+  readonly attribute DOMString? override;
+  readonly attribute DOMString value;
+  readonly attribute FrozenArray<DOMString> validValues;
+
+  undefined clearOverride();
+  Promise<undefined> requestOverride(DOMString? value);
+
+  attribute EventHandler onchange;
+};
diff --git a/tests/wpt/tests/interfaces/webauthn.idl b/tests/wpt/tests/interfaces/webauthn.idl
index b4c0c2de603..2b855144650 100644
--- a/tests/wpt/tests/interfaces/webauthn.idl
+++ b/tests/wpt/tests/interfaces/webauthn.idl
@@ -302,7 +302,7 @@ enum ClientCapability {
     "signalUnknownCredential"
 };
 
-enum PublicKeyCredentialHints {
+enum PublicKeyCredentialHint {
     "security-key",
     "client-device",
     "hybrid",
diff --git a/tests/wpt/tests/interfaces/webhid.idl b/tests/wpt/tests/interfaces/webhid.idl
index 03e72511d96..56e3161caed 100644
--- a/tests/wpt/tests/interfaces/webhid.idl
+++ b/tests/wpt/tests/interfaces/webhid.idl
@@ -7,12 +7,12 @@
     [SameObject] readonly attribute HID hid;
 };
 
-[Exposed=ServiceWorker, SecureContext]
+[Exposed=(DedicatedWorker,ServiceWorker), SecureContext]
 partial interface WorkerNavigator {
     [SameObject] readonly attribute HID hid;
 };
 
-[Exposed=(Window,ServiceWorker), SecureContext]
+[Exposed=(DedicatedWorker,ServiceWorker,Window), SecureContext]
 interface HID : EventTarget {
     attribute EventHandler onconnect;
     attribute EventHandler ondisconnect;
@@ -33,7 +33,7 @@ dictionary HIDDeviceFilter {
     unsigned short usage;
 };
 
-[Exposed=Window, SecureContext]
+[Exposed=(DedicatedWorker,ServiceWorker,Window), SecureContext]
 interface HIDDevice : EventTarget {
     attribute EventHandler oninputreport;
     readonly attribute boolean opened;
@@ -51,7 +51,7 @@ interface HIDDevice : EventTarget {
     Promise<DataView> receiveFeatureReport([EnforceRange] octet reportId);
 };
 
-[Exposed=Window, SecureContext]
+[Exposed=(DedicatedWorker,ServiceWorker,Window), SecureContext]
 interface HIDConnectionEvent : Event {
     constructor(DOMString type, HIDConnectionEventInit eventInitDict);
     [SameObject] readonly attribute HIDDevice device;
@@ -61,7 +61,7 @@ dictionary HIDConnectionEventInit : EventInit {
     required HIDDevice device;
 };
 
-[Exposed=Window, SecureContext]
+[Exposed=(DedicatedWorker,ServiceWorker,Window), SecureContext]
 interface HIDInputReportEvent : Event {
     constructor(DOMString type, HIDInputReportEventInit eventInitDict);
     [SameObject] readonly attribute HIDDevice device;
diff --git a/tests/wpt/tests/interfaces/webnn.idl b/tests/wpt/tests/interfaces/webnn.idl
index f8db7b0d542..9a71f73954c 100644
--- a/tests/wpt/tests/interfaces/webnn.idl
+++ b/tests/wpt/tests/interfaces/webnn.idl
@@ -90,7 +90,7 @@ enum MLOperandDataType {
 
 dictionary MLOperandDescriptor {
   required MLOperandDataType dataType;
-  sequence<[EnforceRange] unsigned long> dimensions = [];
+  sequence<[EnforceRange] unsigned long> shape = [];
 };
 
 [SecureContext, Exposed=(Window, DedicatedWorker)]
diff --git a/tests/wpt/tests/interfaces/webtransport.idl b/tests/wpt/tests/interfaces/webtransport.idl
index 2136cad41e3..6e9d1036736 100644
--- a/tests/wpt/tests/interfaces/webtransport.idl
+++ b/tests/wpt/tests/interfaces/webtransport.idl
@@ -25,6 +25,7 @@ interface WebTransport {
   readonly attribute WebTransportCongestionControl congestionControl;
   [EnforceRange] attribute unsigned short? anticipatedConcurrentIncomingUnidirectionalStreams;
   [EnforceRange] attribute unsigned short? anticipatedConcurrentIncomingBidirectionalStreams;
+  readonly attribute DOMString protocol;
 
   readonly attribute Promise<WebTransportCloseInfo> closed;
   readonly attribute Promise<undefined> draining;
@@ -64,6 +65,7 @@ dictionary WebTransportOptions {
   WebTransportCongestionControl congestionControl = "default";
   [EnforceRange] unsigned short? anticipatedConcurrentIncomingUnidirectionalStreams = null;
   [EnforceRange] unsigned short? anticipatedConcurrentIncomingBidirectionalStreams = null;
+  sequence<DOMString> protocols = [];
 };
 
 enum WebTransportCongestionControl {
diff --git a/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
index 3bae50c346d..7c583a568c9 100644
--- a/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
+++ b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
@@ -71,11 +71,25 @@
     const afterGum = await navigator.mediaDevices.getUserMedia({
       video: true, audio: true
     });
-    afterGum.getTracks().forEach(track => track.stop());
-
     const devices = await navigator.mediaDevices.enumerateDevices();
     const inputDevices = devices.filter(({kind}) => kind != "audiooutput");
     assert_greater_than(inputDevices.length, 1, "have at least 2 test devices");
+
+    // first check the default tracks from the already called getUserMedia()
+    for (const track of afterGum.getTracks()) {
+      const settings = track.getSettings();
+      const device = inputDevices.find(({deviceId}) => deviceId == settings.deviceId);
+      assert_not_equals(device, undefined, `track was from an enumerated device`);
+      assert_equals(`${track.kind}input`, device.kind, `default track is the right kind.`);
+      track.stop();
+      assert_equals(typeof settings.deviceId, "string", "default deviceId is a string");
+      assert_greater_than(settings.deviceId.length, 0, "default deviceId is not empty");
+      assert_equals(settings.deviceId, device.deviceId, "default track deviceId matches device");
+      assert_equals(typeof settings.groupId, "string", "default groupId is a string.");
+      assert_greater_than(settings.groupId.length, 0, "default groupId is not empty");
+      assert_equals(settings.groupId, device.groupId, "default track groupId matches device");
+    }
+    // then check explicitly requesting each input device
     for (const {kind, deviceId, groupId} of inputDevices) {
       const type = {videoinput: "video", audioinput: "audio"}[kind];
       const stream = await navigator.mediaDevices.getUserMedia({
@@ -84,22 +98,15 @@
       const [track] = stream.getTracks();
       const settings = track.getSettings();
       track.stop();
-      assert_true(settings.groupId == groupId, "device groupId");
+      assert_equals(`${track.kind}input`, kind, `track is of the right kind.`);
+      assert_equals(typeof settings.deviceId, "string", "deviceId is a string.");
+      assert_greater_than(settings.deviceId.length, 0, "deviceId is not empty");
+      assert_equals(settings.deviceId, deviceId, "track and device deviceIds match");
+      assert_equals(typeof settings.groupId, "string", "groupId is a string.");
       assert_greater_than(settings.groupId.length, 0, "groupId is not empty");
+      assert_equals(settings.groupId, groupId, "track and device groupId match");
     }
-  }, 'groupId is correctly reported by getSettings() for all input devices');
-
-  promise_test(async t => {
-    const settings = await createTrackAndGetSettings(t, "audio");
-    assert_equals(typeof(settings.deviceId), "string",
-                  "deviceId should exist and it should be a string.");
-  }, 'deviceId is reported by getSettings() for getUserMedia() audio tracks');
-
-  promise_test(async t => {
-    const settings = await createTrackAndGetSettings(t, "audio");
-    assert_equals(typeof(settings.groupId), "string",
-                  "groupId should exist and it should be a string.");
-  }, 'groupId is reported by getSettings() for getUserMedia() audio tracks');
+  }, 'deviceId and groupId are correctly reported by getSettings() for all input devices');
 
   promise_test(async t => {
     const settings = await createTrackAndGetSettings(t, "audio");
@@ -153,18 +160,6 @@
     assert_greater_than(settings.channelCount, 0);
   }, 'channelCount is reported by getSettings() for getUserMedia() audio tracks');
 
-  promise_test(async t => {
-    const settings = await createTrackAndGetSettings(t, "video");
-    assert_equals(typeof(settings.deviceId), "string",
-                  "deviceId should exist and it should be a string.");
-  }, 'deviceId is reported by getSettings() for getUserMedia() video tracks');
-
-  promise_test(async t => {
-    const settings = await createTrackAndGetSettings(t, "video");
-    assert_equals(typeof(settings.groupId), "string",
-                  "groupId should exist and it should be a string.");
-  }, 'groupId is reported by getSettings() for getUserMedia() video tracks');
-
   promise_test(async t => {
     const settings = await createTrackAndGetSettings(t, "video");
     assert_equals(typeof(settings.width), "number",
diff --git a/tests/wpt/tests/nav-tracking-mitigations/META.yml b/tests/wpt/tests/nav-tracking-mitigations/META.yml
new file mode 100644
index 00000000000..00a8c7b72a1
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/META.yml
@@ -0,0 +1,9 @@
+spec: https://privacycg.github.io/nav-tracking-mitigations/
+suggested_reviewers:
+  - amaliev
+  - bvandersloot-mozilla
+  - hoodjoshua
+  - njeunje
+  - rtarpine-google
+  - Trikolon
+  - wanderview
diff --git a/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
new file mode 100644
index 00000000000..7676378a23f
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  // `document.cookie` is set using the `Set-Cookie` HTTP header in
+  // cross-origin-client-redirect-with-cookie-header.sub.https.html.headers.
+  assert_equals(document.cookie, 'example=test');
+
+  const url = new URL('redirect-chain-end.sub.https.html',
+                      window.location.href);
+  url.hostname = '{{host}}';
+
+  window.location = url;
+</script>
diff --git a/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html.headers b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html.headers
new file mode 100644
index 00000000000..64415c3575b
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html.headers
@@ -0,0 +1,2 @@
+Content-Type: text/html
+Set-Cookie: example=test
diff --git a/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-get-cookie.sub.https.html b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-get-cookie.sub.https.html
new file mode 100644
index 00000000000..50277cb28a1
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/resources/cross-origin-get-cookie.sub.https.html
@@ -0,0 +1,5 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<script>
+window.opener.postMessage({cookie: document.cookie}, '*');
+</script>
diff --git a/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-end.sub.https.html b/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-end.sub.https.html
new file mode 100644
index 00000000000..54966d6efd4
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-end.sub.https.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Bounce Tracking Mitigations: Stateful Client Bounce (End Page)</title>
+<script>
+  // Notify the main test page that the redirect flow has completed.
+  window.opener.postMessage(true, '*');
+
+  // This will end the redirect chain.
+  window.close();
+</script>
diff --git a/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html b/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
new file mode 100644
index 00000000000..a1655f4483e
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Bounce Tracking Mitigations: Stateful Client Bounce (Start Page)</title>
+<body></body>
+<script src=/resources/testdriver.js></script>
+<script>
+  const url = new URL(
+    'cross-origin-client-redirect-with-cookie-header.sub.https.html',
+    window.location.href);
+  url.hostname = '{{hosts[alt][]}}';
+
+  const link = document.createElement('a');
+  link.href = url;
+  // Used by the main test page to retrieve the button.
+  link.id = 'navigate-link';
+  link.text = 'navigate to redirecting page';
+  document.body.append(link);
+</script>
diff --git a/tests/wpt/tests/nav-tracking-mitigations/stateful-client-bounce.sub.https.html b/tests/wpt/tests/nav-tracking-mitigations/stateful-client-bounce.sub.https.html
new file mode 100644
index 00000000000..798d58fad65
--- /dev/null
+++ b/tests/wpt/tests/nav-tracking-mitigations/stateful-client-bounce.sub.https.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Bounce Tracking Mitigations: Stateful Client Bounce</title>
+<body>body for test_driver.bless</body>
+<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>
+  promise_setup(async () => {
+    try {
+      await test_driver.set_storage_access('*', '*', 'blocked');
+    } catch (e) {
+      // Ignore, can be unimplemented if the platform blocks cross-site
+      // cookies by default. If this failed without default blocking the test
+      // will fail.
+    }
+  });
+
+  promise_test(async t => {
+    let linkInNewPage = null;
+
+    // Open a new tab and retrieve the link to start the test.
+    await test_driver.bless('open page to start test', async () => {
+      const otherTab = window.open(
+        'resources/redirect-chain-start.sub.https.html');
+
+      await new Promise(resolve => otherTab.addEventListener('load', resolve));
+      linkInNewPage = otherTab.document.getElementById('navigate-link');
+    });
+
+    const redirectEndedPromise = new Promise(resolve => {
+      window.addEventListener('message', resolve, {once: true});
+    });
+
+    // Click the link in the new tab.
+    //
+    // Ideally, we would click this from within the page, but because the page
+    // immediately navigates away, test_driver fails as it expects the page to
+    // not navigate away. Doing this from the main test page avoids the issue.
+    test_driver.click(linkInNewPage);
+
+    await redirectEndedPromise;
+
+    let result = [];
+    while (result.length == 0) {
+      result = await test_driver.run_bounce_tracking_mitigations();
+    }
+    assert_array_equals(result, ['{{hosts[alt][]}}']);
+
+    // Open a page on the bounce origin, and check that cookies have been
+    // cleared.
+    const getCookiesFromBounceOrigin = new Promise(
+      resolve => {
+        window.addEventListener(
+          'message',
+          (event) => { resolve(event.data.cookie) },
+          {once: true})
+    });
+
+    const url = new URL(
+      'resources/cross-origin-get-cookie.sub.https.html',
+      window.location.href);
+    url.hostname = '{{hosts[alt][]}}';
+    window.open(url);
+
+    assert_equals(await getCookiesFromBounceOrigin, '');
+  }, 'Bounce tracking mitigations deleting state for a bounce tracker');
+</script>
diff --git a/tests/wpt/tests/notifications/cross-origin-nested.tentative.https.sub.html b/tests/wpt/tests/notifications/cross-origin-nested.tentative.https.sub.html
new file mode 100644
index 00000000000..5430bee0511
--- /dev/null
+++ b/tests/wpt/tests/notifications/cross-origin-nested.tentative.https.sub.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notifications in cross origin iframes</title>
+<link rel="help" href="https://github.com/whatwg/notifications/issues/177">
+<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/helpers.js"></script>
+<script>
+// The syntax below will give us a third party URL.
+// See: https://web-platform-tests.org/writing-tests/server-features.html
+const thirdPartyIframe =
+  'https://{{hosts[alt][]}}:{{ports[https][0]}}/notifications/resources/cross-origin-nested-parent.sub.html';
+const promises = new Map();
+
+// Firefox and Chrome deny notification permission in a third party partitioned
+// iframe even if the permission is granted for origin of the iframe.
+
+// Set up the listeners and then create a third party iframe.
+// The iframe will again create a first party iframe.
+promise_setup(async () => {
+  await trySettingPermission("granted");
+
+  // parent: the third party iframe
+  // child: the first party iframe in the third party one (ABA)
+  for (const iframe of ["parent", "child"]) {
+    // from the iframe window, or the worker opened from there
+    for (const worker of ["", "Worker"]) {
+      // permission attribute (.permission), or
+      // the permission request (.requestPermission())
+      for (const type of ["", "Request"]) {
+        const sender = iframe + worker + type;
+        promises.set(sender, new Promise(r => window.addEventListener("message", ev => {
+          if (ev.data.sender === sender) {
+            r(ev.data);
+          }
+        })));
+      }
+    }
+  }
+
+  const iframe = document.createElement("iframe");
+  iframe.src = thirdPartyIframe;
+  document.body.append(iframe);
+})
+
+promise_test(async t => {
+  const result = await promises.get("parent");
+  assert_equals(result.permission, "denied", `should deny the permission`);
+  assert_false(result.shown, `notification should not be shown`);
+
+  const parentRequestResult = await promises.get("parentRequest");
+  assert_equals(parentRequestResult.permission, "denied", "should deny the permission request");
+}, "third party iframe");
+
+promise_test(async t => {
+  const result = await promises.get("child");
+  assert_equals(result.permission, "granted", `should grant the permission`);
+  assert_true(result.shown, `notification should be shown`);
+
+  const childRequestResult = await promises.get("childRequest");
+  assert_equals(childRequestResult.permission, "granted", "should accept the permission request");
+}, "nested first party iframe");
+
+promise_test(async t => {
+  const result = await promises.get("parentWorker");
+  assert_equals(result.permission, "denied", `should deny the permission`);
+  assert_false(result.shown, `notification should not be shown`);
+}, "third party worker");
+
+promise_test(async t => {
+  const result = await promises.get("childWorker");
+  assert_equals(result.permission, "granted", `should grant the permission`);
+  assert_true(result.shown, `notification should be shown`);
+}, "nested first party worker");
+</script>
diff --git a/tests/wpt/tests/notifications/cross-origin-serviceworker.tentative.https.sub.html b/tests/wpt/tests/notifications/cross-origin-serviceworker.tentative.https.sub.html
new file mode 100644
index 00000000000..ee5ae67dee0
--- /dev/null
+++ b/tests/wpt/tests/notifications/cross-origin-serviceworker.tentative.https.sub.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notifications in cross origin iframes</title>
+<link rel="help" href="https://github.com/whatwg/notifications/issues/177">
+<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/helpers.js"></script>
+<script>
+// The syntax below will give us a third party URL.
+// See: https://web-platform-tests.org/writing-tests/server-features.html
+const thirdPartyOrigin = 'https://{{hosts[alt][]}}:{{ports[https][0]}}';
+const thirdPartyIframe =
+  `${thirdPartyOrigin}/notifications/resources/cross-origin-serviceworker-iframe.sub.html`;
+let promise;
+
+promise_setup(async () => {
+  await trySettingPermission("granted");
+
+  promise = new Promise(r => window.addEventListener("message", ev => {
+    if ("shown" in ev.data) {
+      r(ev.data)
+    }
+  }));
+
+  const iframe = document.createElement("iframe");
+  iframe.src = thirdPartyIframe;
+  document.body.append(iframe);
+})
+
+promise_test(async t => {
+  const result = await promise;
+  assert_false(result.shown, `notification should not be shown`);
+}, "third party serviceworker");
+</script>
diff --git a/tests/wpt/tests/notifications/permissions-non-secure.html b/tests/wpt/tests/notifications/permissions-non-secure.html
index 0f4724c9b66..3a2930a4527 100644
--- a/tests/wpt/tests/notifications/permissions-non-secure.html
+++ b/tests/wpt/tests/notifications/permissions-non-secure.html
@@ -13,4 +13,10 @@ promise_test(t => {
 test(t => {
   assert_equals(Notification.permission, "denied");
 }, "Notification.permission must be called from a secure context");
+
+promise_test(async t => {
+  const worker = new Worker("resources/permission-worker.js", { type: "module" });
+  const data = await new Promise(r => worker.onmessage = ev => r(ev.data));
+  assert_equals(data.permission, "denied");
+}, "Notification.permission must be called from a secure worker");
 </script>
diff --git a/tests/wpt/tests/notifications/resources/cross-origin-nested-child.sub.html b/tests/wpt/tests/notifications/resources/cross-origin-nested-child.sub.html
new file mode 100644
index 00000000000..bc2fffc753d
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/cross-origin-nested-child.sub.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification nested iframe first party child</title>
+<body>
+<script type="module">
+import { permissionTest } from "./permission-helper.js"
+
+permissionTest('https://{{hosts[][]}}:{{ports[https][0]}}', "child");
+</script>
diff --git a/tests/wpt/tests/notifications/resources/cross-origin-nested-parent.sub.html b/tests/wpt/tests/notifications/resources/cross-origin-nested-parent.sub.html
new file mode 100644
index 00000000000..0feb74892d2
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/cross-origin-nested-parent.sub.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification nested iframe third party parent</title>
+<body>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script type="module">
+import { permissionTest } from "./permission-helper.js"
+
+// Grant the permission so that we can confirm the permission being denied
+// regardless of the actual permission status.
+test_driver.set_test_context(window.top);
+await test_driver.set_permission({ name: "notifications" }, "granted");
+
+const firstPartyOrigin = 'https://{{hosts[][]}}:{{ports[https][0]}}';
+
+permissionTest(firstPartyOrigin, "parent");
+
+const nestedChild =
+  `${firstPartyOrigin}/notifications/resources/cross-origin-nested-child.sub.html`;
+const iframe = document.createElement("iframe");
+iframe.src = nestedChild;
+document.body.append(iframe);
+</script>
diff --git a/tests/wpt/tests/notifications/resources/cross-origin-serviceworker-iframe.sub.html b/tests/wpt/tests/notifications/resources/cross-origin-serviceworker-iframe.sub.html
new file mode 100644
index 00000000000..5da8ab9f587
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/cross-origin-serviceworker-iframe.sub.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification cross origin iframe with service worker</title>
+<body>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="helpers.js"></script>
+<script type="module">
+const firstPartyOrigin = 'https://{{hosts[][]}}:{{ports[https][0]}}';
+
+// As our service worker cannot directly ping the first party window,
+// let's be a proxy here.
+navigator.serviceWorker.addEventListener("message", ev => {
+  window.top.postMessage(ev.data, firstPartyOrigin);
+});
+
+// Grant the permission so that we can confirm the permission being denied
+// regardless of the actual permission status.
+test_driver.set_test_context(window.top);
+await test_driver.set_permission({ name: "notifications" }, "granted");
+
+await unregisterAllServiceWorker();
+const registration = await navigator.serviceWorker.register("permission-sw.js");
+</script>
diff --git a/tests/wpt/tests/notifications/resources/permission-helper.js b/tests/wpt/tests/notifications/resources/permission-helper.js
new file mode 100644
index 00000000000..22b11abae52
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/permission-helper.js
@@ -0,0 +1,24 @@
+export function permissionTest(origin, sender) {
+  function ping(message) {
+    if (!globalThis.WorkerGlobalScope) {
+      window.top.postMessage(message, origin);
+    } else {
+      globalThis.postMessage(message);
+    }
+    n.close();
+  }
+
+  const n = new Notification(sender);
+  const permission = Notification.permission;
+  n.onshow = () => ping({ sender, permission, shown: true });
+  n.onerror = () => ping({ sender, permission, shown: false });
+
+  if (!globalThis.WorkerGlobalScope) {
+    Notification.requestPermission().then(permission => ping({ sender: `${sender}Request`, permission }));
+
+    const workerUrl = new URL(`./permission-worker.js`, import.meta.url);
+    workerUrl.searchParams.set("sender", `${sender}Worker`);
+    const worker = new Worker(workerUrl, { type: "module" });
+    worker.onmessage = ev => ping(ev.data, origin);
+  }
+}
diff --git a/tests/wpt/tests/notifications/resources/permission-sw.js b/tests/wpt/tests/notifications/resources/permission-sw.js
new file mode 100644
index 00000000000..5f231e46d01
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/permission-sw.js
@@ -0,0 +1,19 @@
+importScripts("helpers.js");
+
+// Send the result to the clients of this service worker.
+async function ping(message) {
+  const clients = await self.clients.matchAll({ includeUncontrolled: true });
+  for (const client of clients) {
+    client.postMessage(message);
+  }
+  for (const n of await registration.getNotifications()) {
+    n.close();
+  }
+}
+
+(async () => {
+  await untilActivate();
+
+  const shown = await registration.showNotification("serviceworker").then(() => true, err => false);
+  ping({ shown });
+})();
diff --git a/tests/wpt/tests/notifications/resources/permission-worker.js b/tests/wpt/tests/notifications/resources/permission-worker.js
new file mode 100644
index 00000000000..17314bd5e1e
--- /dev/null
+++ b/tests/wpt/tests/notifications/resources/permission-worker.js
@@ -0,0 +1,4 @@
+import { permissionTest } from "./permission-helper.js"
+
+const params = new URL(import.meta.url).searchParams;
+permissionTest(null, params.get("sender"));
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.close.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.close.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.close.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.cookies-popin.py b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.cookies-popin.py
index f5d94c3c5f1..74024dd2f00 100644
--- a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.cookies-popin.py
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.cookies-popin.py
@@ -3,6 +3,7 @@ def main(request, response):
     id = request.GET[b'id']
     headers = setNoCacheAndCORSHeaders(request, response)
     headers[0] = (b"Content-Type", b"text/html")
+    headers.append((b'Popin-Policy', b"partitioned=*"))
     cookies = readCookies(request)
     message = b"ReadOnLoad:"
     if cookies.get(b"first-party-strict") == id:
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.localStorage-popin.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.localStorage-popin.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.localStorage-popin.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.permissions-popin.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.permissions-popin.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.permissions-popin.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.proxy-popin.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.proxy-popin.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.proxy-popin.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.recursive.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.recursive.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.recursive.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.http.py b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.http.py
index 440d9da94dd..60a0fc2a28a 100644
--- a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.http.py
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.http.py
@@ -3,6 +3,7 @@ def main(request, response):
     # Step 4 (partitioned-popins/partitioned-popins.request-header.tentative.https.window.js)
     headers = setNoCacheAndCORSHeaders(request, response)
     headers[0] = (b"Content-Type", b"text/html")
+    headers.append((b'Popin-Policy', b"partitioned=*"))
     message = request.GET[b'message']
     message += b"HTTP("
     message += request.headers.get(b"Sec-Popin-Context", b"missing")
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.initial.py b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.initial.py
index 59e7e947876..f182ae3dee1 100644
--- a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.initial.py
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.initial.py
@@ -6,4 +6,5 @@ def main(request, response):
     message += b")-"
     headers = setNoCacheAndCORSHeaders(request, response)
     headers.append((b'Location', b"/partitioned-popins/resources/partitioned-popins.request-header.http.py?message=" + message))
+    headers.append((b'Popin-Policy', b"partitioned=*"))
     return 302, headers, b'{"redirect": true}'
\ No newline at end of file
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.js.py b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.js.py
index 603891733fd..7878693b220 100644
--- a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.js.py
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.request-header.js.py
@@ -3,6 +3,7 @@ def main(request, response):
     # Step 5 (partitioned-popins/partitioned-popins.request-header.tentative.https.window.js)
     headers = setNoCacheAndCORSHeaders(request, response)
     headers[0] = (b"Content-Type", b"text/html")
+    headers.append((b'Popin-Policy', b"partitioned=*"))
     message = request.GET[b'message']
     message += b"JS("
     message += request.headers.get(b"Sec-Popin-Context", b"missing")
diff --git a/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.wait.html.headers b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.wait.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/partitioned-popins.wait.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/popinContextType.html.headers b/tests/wpt/tests/partitioned-popins/resources/popinContextType.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/popinContextType.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/partitioned-popins/resources/popinContextTypesSupported.html.headers b/tests/wpt/tests/partitioned-popins/resources/popinContextTypesSupported.html.headers
new file mode 100644
index 00000000000..783b6856418
--- /dev/null
+++ b/tests/wpt/tests/partitioned-popins/resources/popinContextTypesSupported.html.headers
@@ -0,0 +1 @@
+Popin-Policy: partitioned=*
diff --git a/tests/wpt/tests/permissions-policy/resources/digital-credentials-get.html b/tests/wpt/tests/permissions-policy/resources/digital-credentials-get.html
index 04f256c2447..489e4291359 100644
--- a/tests/wpt/tests/permissions-policy/resources/digital-credentials-get.html
+++ b/tests/wpt/tests/permissions-policy/resources/digital-credentials-get.html
@@ -11,7 +11,7 @@
         }
         let enabled = undefined;
         try {
-            await navigator.identity.get(makeGetOptions([]));
+            await navigator.credentials.get(makeGetOptions([]));
         } catch (e) {
             switch (e.name) {
                 case "NotAllowedError":
diff --git a/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.html
new file mode 100644
index 00000000000..9a0c1f94f8e
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.html
@@ -0,0 +1,10 @@
+<script>
+'use strict';
+
+let worker = new Worker('permissions-policy-hid-worker.js');
+
+worker.onmessage = event => {
+  window.parent.postMessage(event.data, '*');
+};
+worker.postMessage({ type: 'ready' });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.js
new file mode 100644
index 00000000000..d7490b2be71
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid-worker.js
@@ -0,0 +1,14 @@
+'use strict';
+
+// Dedicated worker
+if (typeof postMessage === 'function') {
+  onmessage = event => {
+    switch(event.data.type) {
+      case 'ready':
+        navigator.hid.getDevices().then(
+            () => postMessage({ type: 'availability-result', enabled: true }),
+            error => postMessage ({ type: 'availability-result', enabled: false }));
+        break;
+    }
+  };
+}
diff --git a/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid.html
new file mode 100644
index 00000000000..0b54d57cfa0
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/resources/permissions-policy-hid.html
@@ -0,0 +1,9 @@
+<script>
+'use strict';
+
+Promise.resolve().then(() => navigator.hid.getDevices()).then(devices => {
+  window.parent.postMessage({ type: 'availability-result', enabled: true }, '*');
+}, error => {
+  window.parent.postMessage({ type: 'availability-result', enabled: false }, '*');
+});
+</script>
diff --git a/tests/wpt/tests/png/support/cicp-display-p3.png b/tests/wpt/tests/png/support/cicp-display-p3.png
index 8fa0ce2123c4f876a71b1ca80e04931614f3b87f..dc5277bedd4c5a9789126e064bc95541d7972b9f 100644
GIT binary patch
delta 26
hcmeBY>}Q;y!poBE=^Vhr%fOh&{P_JuMd^t?&H!8V2X6oX

delta 15
WcmeBY>}Q;yGSNh0qKd#oA7=n1t^}6=

diff --git a/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html
index 34c935a6039..4a5c135d48c 100644
--- a/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html
+++ b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Constructing a PresentationConnectionCloseEvent</title>
-<link rel="author" title="mark a. foltz" href="https://github.com/mfoltzgoogle">
+<link rel="author" title="mark a. foltz" href="https://github.com/markafoltz">
 <link rel="help" href="http://w3c.github.io/presentation-api/#controlling-user-agent">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/remote-playback/META.yml b/tests/wpt/tests/remote-playback/META.yml
index a234398b8b8..e1caed7d74c 100644
--- a/tests/wpt/tests/remote-playback/META.yml
+++ b/tests/wpt/tests/remote-playback/META.yml
@@ -1,4 +1,4 @@
 spec: https://w3c.github.io/remote-playback/
 suggested_reviewers:
-  - mfoltzgoogle
+  - markafoltz
   - louaybassbouss
diff --git a/tests/wpt/tests/resources/testdriver-actions.js b/tests/wpt/tests/resources/testdriver-actions.js
index 3e5ba74b4ca..edb4759954d 100644
--- a/tests/wpt/tests/resources/testdriver-actions.js
+++ b/tests/wpt/tests/resources/testdriver-actions.js
@@ -290,7 +290,7 @@
     },
 
     /**
-     * Create a keyDown event for the current default key source
+     * Create a keyUp event for the current default key source
      *
      * @param {String} key - Key to release
      * @param {String?} sourceName - Named key source to use or null for the default key source
diff --git a/tests/wpt/tests/resources/testdriver.js b/tests/wpt/tests/resources/testdriver.js
index e737a6ee659..d05be1d7df9 100644
--- a/tests/wpt/tests/resources/testdriver.js
+++ b/tests/wpt/tests/resources/testdriver.js
@@ -176,11 +176,10 @@
         },
 
         /**
-         * Triggers a user-initiated click
+         * Triggers a user-initiated mouse click.
          *
-         * If ``element`` isn't inside the
-         * viewport, it will be scrolled into view before the click
-         * occurs.
+         * If ``element`` isn't inside the viewport, it will be
+         * scrolled into view before the click occurs.
          *
          * If ``element`` is from a different browsing context, the
          * command will be run in that context.
@@ -1141,6 +1140,82 @@
          */
         run_bounce_tracking_mitigations: function (context = null) {
             return window.test_driver_internal.run_bounce_tracking_mitigations(context);
+        },
+
+        /**
+         * Creates a virtual pressure source.
+         *
+         * Matches the `Create virtual pressure source
+         * <https://w3c.github.io/compute-pressure/#create-virtual-pressure-source>`_
+         * WebDriver command.
+         *
+         * @param {String} source_type - A `virtual pressure source type
+         *                               <https://w3c.github.io/compute-pressure/#dom-pressuresource>`_
+         *                               such as "cpu".
+         * @param {Object} [metadata={}] - Optional parameters described
+         *                                 in `Create virtual pressure source
+         *                                 <https://w3c.github.io/compute-pressure/#create-virtual-pressure-source>`_.
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled when virtual pressure source is created.
+         *                    Rejected in case the WebDriver command errors out
+         *                    (including if a virtual pressure source of the
+         *                    same type already exists).
+         */
+        create_virtual_pressure_source: function(source_type, metadata={}, context=null) {
+            return window.test_driver_internal.create_virtual_pressure_source(source_type, metadata, context);
+        },
+
+        /**
+         * Causes a virtual pressure source to report a new reading.
+         *
+         * Matches the `Update virtual pressure source
+         * <https://w3c.github.io/compute-pressure/#update-virtual-pressure-source>`_
+         * WebDriver command.
+         *
+         * @param {String} source_type - A `virtual pressure source type
+         *                               <https://w3c.github.io/compute-pressure/#dom-pressuresource>`_
+         *                               such as "cpu".
+         * @param {String} sample - A `virtual pressure state
+         *                          <https://w3c.github.io/compute-pressure/#dom-pressurestate>`_
+         *                          such as "critical".
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled after the reading update reaches the
+         *                    virtual pressure source. Rejected in case the
+         *                    WebDriver command errors out (including if a
+         *                    virtual pressure source of the given type does not
+         *                    exist).
+         */
+        update_virtual_pressure_source: function(source_type, sample, context=null) {
+            return window.test_driver_internal.update_virtual_pressure_source(source_type, sample, context);
+        },
+
+        /**
+         * Removes created virtual pressure source.
+         *
+         * Matches the `Delete virtual pressure source
+         * <https://w3c.github.io/compute-pressure/#delete-virtual-pressure-source>`_
+         * WebDriver command.
+         *
+         * @param {String} source_type - A `virtual pressure source type
+         *                               <https://w3c.github.io/compute-pressure/#dom-pressuresource>`_
+         *                               such as "cpu".
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled after the virtual pressure source has
+         *                    been removed or if a pressure source of the given
+         *                    type does not exist. Rejected in case the
+         *                    WebDriver command errors out.
+         */
+        remove_virtual_pressure_source: function(source_type, context=null) {
+            return window.test_driver_internal.remove_virtual_pressure_source(source_type, context);
         }
     };
 
@@ -1356,6 +1431,18 @@
 
         async run_bounce_tracking_mitigations(context=null) {
             throw new Error("run_bounce_tracking_mitigations() is not implemented by testdriver-vendor.js");
+        },
+
+        async create_virtual_pressure_source(source_type, metadata={}, context=null) {
+            throw new Error("create_virtual_pressure_source() is not implemented by testdriver-vendor.js");
+        },
+
+        async update_virtual_pressure_source(source_type, sample, context=null) {
+            throw new Error("update_virtual_pressure_source() is not implemented by testdriver-vendor.js");
+        },
+
+        async remove_virtual_pressure_source(source_type, context=null) {
+            throw new Error("remove_virtual_pressure_source() is not implemented by testdriver-vendor.js");
         }
     };
 })();
diff --git a/tests/wpt/tests/selection/Selection-direction-on-clicks.tentative.html b/tests/wpt/tests/selection/Selection-direction-on-clicks.tentative.html
new file mode 100644
index 00000000000..8bff6e9396a
--- /dev/null
+++ b/tests/wpt/tests/selection/Selection-direction-on-clicks.tentative.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+<body>
+<meta name="author" title="Sean Feng" href="mailto:sean@seanfeng.dev">
+<meta name="assert" content="Selection on clicks: direction should return none, forwad, or backward">
+<link rel="help" href="https://w3c.github.io/selection-api/#dom-selection-direction">
+<link rel="help" href="https://github.com/w3c/selection-api/issues/177">
+<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>
+<div id="container"></div>
+<script>
+
+// Note: This test should remain tentative until Selection API issue 177 is
+// resolved and direction for clicks are specified.
+
+promise_test(async () => {
+    container.innerHTML = 'hello, world';
+    const doubleClick = new test_driver.Actions()
+      .pointerMove(0, 0, container.firstChild)
+      .pointerDown()
+      .pointerUp()
+      .pointerDown()
+      .pointerUp()
+      .send();
+    await doubleClick;
+
+    const sel = getSelection();
+    assert_equals(sel.anchorNode, container.firstChild);
+    assert_equals(sel.anchorOffset, 0);
+    assert_equals(sel.focusNode, container.firstChild);
+    assert_equals(sel.focusOffset, 5); // hello
+    assert_equals(sel.direction, 'none');
+}, 'direction returns "none" when there is a double click selection(directionless)');
+
+promise_test(async () => {
+    container.innerHTML = 'hello, world';
+    const tripleClick = new test_driver.Actions()
+      .pointerMove(0, 0, container.firstChild)
+      .pointerDown()
+      .pointerUp()
+      .pointerDown()
+      .pointerUp()
+      .pointerDown()
+      .pointerUp()
+      .send();
+    await tripleClick;
+
+    const sel = getSelection();
+    assert_equals(sel.anchorNode, container);
+    assert_equals(sel.anchorOffset, 0);
+    assert_equals(sel.focusNode, container);
+    assert_equals(sel.focusOffset, 1);
+    assert_equals(sel.direction, 'none');
+}, 'direction returns "none" when there is a triple click selection(directionless)');
+
+promise_test(async () => {
+    container.innerHTML = 'hello, world';
+    const click = new test_driver.Actions()
+      .pointerMove(0, 0, container.firstChild)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    await click;
+
+    const sel = getSelection();
+    assert_equals(sel.anchorNode, container.firstChild);
+    assert_equals(sel.anchorOffset, 0);
+    assert_equals(sel.focusNode, container.firstChild);
+    assert_equals(sel.focusOffset, 0);
+    assert_true(sel.isCollapsed);
+    assert_equals(sel.direction, 'none');
+}, 'direction returns "none" when the selection is collapsed');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shadow-dom/selection-direction.tentative.html b/tests/wpt/tests/selection/shadow-dom/tentative/Selection-direction.html
similarity index 100%
rename from tests/wpt/tests/shadow-dom/selection-direction.tentative.html
rename to tests/wpt/tests/selection/shadow-dom/tentative/Selection-direction.html
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/dom-mutation.html b/tests/wpt/tests/shadow-dom/reference-target/tentative/dom-mutation.html
new file mode 100644
index 00000000000..54479e00dca
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/dom-mutation.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<div id="test-container"></div>
+
+<script>
+async function setup_test() {
+  const test_container = document.querySelector("#test-container");
+  test_container.setHTMLUnsafe(`
+    <div id="host1">
+      <template shadowrootmode="open" shadowrootreferencetarget="label1">
+        <span>Outside the label</span>
+        <label id="label1">Label 1</label>
+        <label id="label2">Label 2</label>
+      </template>
+    </div>
+    <input id="input1" aria-labelledby="host1">`);
+  const input1 = test_container.querySelector("#input1");
+  assert_equals(await test_driver.get_computed_label(input1), "Label 1");
+  return test_container
+}
+
+promise_test(async t => {
+  const test_container = await setup_test();
+  const host1 = test_container.querySelector("#host1");
+  const label1 = host1.shadowRoot.querySelector("#label1");
+  label1.id = "changed";
+  assert_equals(await test_driver.get_computed_label(input1), "Outside the label Label 1 Label 2");
+}, "Changing the ID of the referenced element updates the computed label");
+
+promise_test(async t => {
+  const test_container = await setup_test();
+  const host1 = test_container.querySelector("#host1");
+  const label1 = host1.shadowRoot.querySelector("#label1");
+  label1.remove();
+  assert_equals(await test_driver.get_computed_label(input1), "Outside the label Label 2");
+}, "Removing the referenced element updates the computed label");
+
+promise_test(async t => {
+  const test_container = await setup_test();
+  const host1 = test_container.querySelector("#host1");
+  const new_label = document.createElement("label");
+  new_label.id = "label1";
+  new_label.textContent = "New label";
+  host1.shadowRoot.prepend(new_label);
+  assert_equals(await test_driver.get_computed_label(input1), "New label");
+}, "New referenced element prepended to the shadow supercedes the existing label");
+
+promise_test(async t => {
+  const test_container = await setup_test();
+  const host1 = test_container.querySelector("#host1");
+  host1.shadowRoot.referenceTarget = "label2";
+  assert_equals(await test_driver.get_computed_label(input1), "Label 2");
+}, "Changing the reference target ID updates the computed label");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/tools/ci/tc/tasks/test.yml b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
index fffb146dacc..ee6f0fa9aeb 100644
--- a/tests/wpt/tests/tools/ci/tc/tasks/test.yml
+++ b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
@@ -195,7 +195,7 @@ tasks:
                 browser: chrome
                 channel: dev
               use:
-                - trigger-master
+                - trigger-weekly
                 - trigger-push
             - vars:
                 browser: chrome
@@ -295,7 +295,7 @@ tasks:
                 browser: chrome
                 channel: dev
               use:
-                - trigger-master
+                - trigger-weekly
                 - trigger-push
             - vars:
                 browser: chrome
diff --git a/tests/wpt/tests/tools/ci/tc/tests/test_valid.py b/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
index dd8d7326542..04c58f86c59 100644
--- a/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
+++ b/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
@@ -153,22 +153,6 @@ def test_verify_payload():
       'wpt-chrome-canary-testharness-14',
       'wpt-chrome-canary-testharness-15',
       'wpt-chrome-canary-testharness-16',
-      'wpt-chrome-dev-testharness-1',
-      'wpt-chrome-dev-testharness-2',
-      'wpt-chrome-dev-testharness-3',
-      'wpt-chrome-dev-testharness-4',
-      'wpt-chrome-dev-testharness-5',
-      'wpt-chrome-dev-testharness-6',
-      'wpt-chrome-dev-testharness-7',
-      'wpt-chrome-dev-testharness-8',
-      'wpt-chrome-dev-testharness-9',
-      'wpt-chrome-dev-testharness-10',
-      'wpt-chrome-dev-testharness-11',
-      'wpt-chrome-dev-testharness-12',
-      'wpt-chrome-dev-testharness-13',
-      'wpt-chrome-dev-testharness-14',
-      'wpt-chrome-dev-testharness-15',
-      'wpt-chrome-dev-testharness-16',
       'wpt-firefox-nightly-reftest-1',
       'wpt-firefox-nightly-reftest-2',
       'wpt-firefox-nightly-reftest-3',
@@ -181,24 +165,14 @@ def test_verify_payload():
       'wpt-chrome-canary-reftest-4',
       'wpt-chrome-canary-reftest-5',
       'wpt-chrome-canary-reftest-6',
-      'wpt-chrome-dev-reftest-1',
-      'wpt-chrome-dev-reftest-2',
-      'wpt-chrome-dev-reftest-3',
-      'wpt-chrome-dev-reftest-4',
-      'wpt-chrome-dev-reftest-5',
-      'wpt-chrome-dev-reftest-6',
       'wpt-firefox-nightly-wdspec-1',
       'wpt-firefox-nightly-wdspec-2',
       'wpt-chrome-canary-wdspec-1',
       'wpt-chrome-canary-wdspec-2',
-      'wpt-chrome-dev-wdspec-1',
-      'wpt-chrome-dev-wdspec-2',
       'wpt-firefox-nightly-crashtest-1',
       'wpt-chrome-canary-crashtest-1',
-      'wpt-chrome-dev-crashtest-1',
       'wpt-firefox-nightly-print-reftest-1',
       'wpt-chrome-canary-print-reftest-1',
-      'wpt-chrome-dev-print-reftest-1',
       'lint']),
     ("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"},
      ['lint',
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
index 14b990f971d..841b9d0933d 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
@@ -39,7 +39,9 @@ class Transport:
         self.read_message_task: Optional[asyncio.Task[Any]] = None
 
     async def start(self) -> None:
-        self.connection = await websockets.connect(self.url)  # type: ignore
+        # Default max_size of 1048576 bytes is too small for some messages.
+        # 128MB should be enough.
+        self.connection = await websockets.connect(self.url, max_size=128 * 1024 * 1024)  # type: ignore
         self.read_message_task = self.loop.create_task(self.read_messages())
 
         for msg in self.send_buf:
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/client.py b/tests/wpt/tests/tools/webdriver/webdriver/client.py
index e41df7f5764..97b29c64bcd 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/client.py
@@ -740,6 +740,29 @@ class Session:
     def screenshot(self):
         return self.send_session_command("GET", "screenshot")
 
+    @command
+    def print(self,
+              background=None,
+              margin=None,
+              orientation=None,
+              page=None,
+              page_ranges=None,
+              scale=None,
+              shrink_to_fit=None):
+        body = {}
+        for prop, value in {
+            "background": background,
+            "margin": margin,
+            "orientation": orientation,
+            "page": page,
+            "pageRanges": page_ranges,
+            "scale": scale,
+            "shrinkToFit": shrink_to_fit,
+        }.items():
+            if value is not None:
+                body[prop] = value
+        return self.send_session_command("POST", "print", body)
+
 
 class ShadowRoot:
     identifier = "shadow-6066-11e4-a52e-4f735466cecf"
@@ -885,6 +908,7 @@ class WebElement:
     def property(self, name):
         return self.send_element_command("GET", "property/%s" % name)
 
+
 class WebFrame:
     identifier = "frame-075b-4da1-b6ba-e579c2d3230a"
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
index 29a95638877..cc25fff8564 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
@@ -42,7 +42,6 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
 def capabilities(server_config, **kwargs):
     browser_required_args = ["--automation",
                              "--javascript-can-open-windows-automatically=true",
-                             "--enable-xss-auditor=false",
                              "--enable-media-capabilities=true",
                              "--enable-encrypted-media=true",
                              "--enable-media-stream=true",
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
index 4bf8d735a1d..859ce8f4fa6 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
@@ -475,6 +475,42 @@ class RunBounceTrackingMitigationsAction:
         self.logger.debug("Running bounce tracking mitigations")
         return self.protocol.storage.run_bounce_tracking_mitigations()
 
+class CreateVirtualPressureSourceAction:
+    name = "create_virtual_pressure_source"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        source_type = payload["source_type"]
+        metadata = payload["metadata"]
+        self.logger.debug("Creating %s pressure source with %s values" % (source_type, metadata))
+        return self.protocol.pressure.create_virtual_pressure_source(source_type, metadata)
+
+class UpdateVirtualPressureSourceAction:
+    name = "update_virtual_pressure_source"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        source_type = payload["source_type"]
+        sample = payload["sample"]
+        return self.protocol.pressure.update_virtual_pressure_source(source_type, sample)
+
+class RemoveVirtualPressureSourceAction:
+    name = "remove_virtual_pressure_source"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        source_type = payload["source_type"]
+        return self.protocol.pressure.remove_virtual_pressure_source(source_type)
+
 actions = [ClickAction,
            DeleteAllCookiesAction,
            GetAllCookiesAction,
@@ -511,4 +547,7 @@ actions = [ClickAction,
            GetVirtualSensorInformationAction,
            SetDevicePostureAction,
            ClearDevicePostureAction,
-           RunBounceTrackingMitigationsAction]
+           RunBounceTrackingMitigationsAction,
+           CreateVirtualPressureSourceAction,
+           UpdateVirtualPressureSourceAction,
+           RemoveVirtualPressureSourceAction]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
index 17ee492057e..4dd2f86f5cf 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
@@ -3,27 +3,24 @@
 import collections
 import os
 import time
-import traceback
 from typing import Mapping, MutableMapping, Type
-from urllib.parse import urljoin
 
 from webdriver import error
 
 from .base import (
     CrashtestExecutor,
     TestharnessExecutor,
-    get_pages,
 )
 from .executorwebdriver import (
     WebDriverCrashtestExecutor,
     WebDriverFedCMProtocolPart,
+    WebDriverPrintRefTestExecutor,
     WebDriverProtocol,
     WebDriverRefTestExecutor,
-    WebDriverRun,
     WebDriverTestharnessExecutor,
     WebDriverTestharnessProtocolPart,
 )
-from .protocol import LeakProtocolPart, PrintProtocolPart, ProtocolPart
+from .protocol import LeakProtocolPart, ProtocolPart
 
 here = os.path.dirname(__file__)
 
@@ -144,54 +141,6 @@ class ChromeDriverTestharnessProtocolPart(WebDriverTestharnessProtocolPart):
         raise Exception("unable to find test window")
 
 
-class ChromeDriverPrintProtocolPart(PrintProtocolPart):
-    def setup(self):
-        self.webdriver = self.parent.webdriver
-        self.runner_handle = None
-
-    def load_runner(self):
-        url = urljoin(self.parent.executor.server_url("http"), "/print_pdf_runner.html")
-        self.logger.debug("Loading %s" % url)
-        try:
-            self.webdriver.url = url
-        except Exception as e:
-            self.logger.critical(
-                "Loading initial page %s failed. Ensure that the "
-                "there are no other programs bound to this port and "
-                "that your firewall rules or network setup does not "
-                "prevent access.\n%s" % (url, traceback.format_exc(e)))
-            raise
-        self.runner_handle = self.webdriver.window_handle
-
-    def render_as_pdf(self, width, height):
-        margin = 0.5
-        params = {
-            # Chrome accepts dimensions in inches; we are using cm
-            "paperWidth": width / 2.54,
-            "paperHeight": height / 2.54,
-            "marginLeft": margin,
-            "marginRight": margin,
-            "marginTop": margin,
-            "marginBottom": margin,
-            "shrinkToFit": False,
-            "printBackground": True,
-        }
-        return self.parent.cdp.execute_cdp_command("Page.printToPDF", params)["data"]
-
-    def pdf_to_png(self, pdf_base64, ranges):
-        handle = self.webdriver.window_handle
-        self.webdriver.window_handle = self.runner_handle
-        try:
-            rv = self.webdriver.execute_async_script("""
-let callback = arguments[arguments.length - 1];
-render('%s').then(result => callback(result))""" % pdf_base64)
-            page_numbers = get_pages(ranges, len(rv))
-            rv = [item for i, item in enumerate(rv) if i + 1 in page_numbers]
-            return rv
-        finally:
-            self.webdriver.window_handle = handle
-
-
 class ChromeDriverFedCMProtocolPart(WebDriverFedCMProtocolPart):
     def confirm_idp_login(self):
         return self.webdriver.send_session_command("POST",
@@ -221,7 +170,6 @@ class ChromeDriverProtocol(WebDriverProtocol):
     implements = [
         ChromeDriverDevToolsProtocolPart,
         ChromeDriverFedCMProtocolPart,
-        ChromeDriverPrintProtocolPart,
         ChromeDriverTestharnessProtocolPart,
     ]
     for base_part in WebDriverProtocol.implements:
@@ -298,49 +246,6 @@ class ChromeDriverTestharnessExecutor(WebDriverTestharnessExecutor, _SanitizerMi
 
 
 @_evaluate_leaks
-class ChromeDriverPrintRefTestExecutor(ChromeDriverRefTestExecutor):
+class ChromeDriverPrintRefTestExecutor(WebDriverPrintRefTestExecutor,
+                                       _SanitizerMixin):  # type: ignore
     protocol_cls = ChromeDriverProtocol
-    is_print = True
-
-    def setup(self, runner, protocol=None):
-        super().setup(runner, protocol)
-        self.protocol.pdf_print.load_runner()
-        self.has_window = False
-        with open(os.path.join(here, "reftest.js")) as f:
-            self.script = f.read()
-
-    def screenshot(self, test, viewport_size, dpi, page_ranges):
-        # https://github.com/web-platform-tests/wpt/issues/7140
-        assert dpi is None
-
-        if not self.has_window:
-            self.protocol.base.execute_script(self.script)
-            self.protocol.base.set_window(self.protocol.webdriver.handles[-1])
-            self.has_window = True
-
-        self.viewport_size = viewport_size
-        self.page_ranges = page_ranges.get(test.url)
-        timeout = self.timeout_multiplier * test.timeout if self.debug_info is None else None
-
-        test_url = self.test_url(test)
-
-        return WebDriverRun(self.logger,
-                            self._render,
-                            self.protocol,
-                            test_url,
-                            timeout,
-                            self.extra_timeout).run()
-
-    def _render(self, protocol, url, timeout):
-        protocol.webdriver.url = url
-
-        protocol.base.execute_script(self.wait_script, asynchronous=True)
-
-        pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
-        screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
-        for i, screenshot in enumerate(screenshots):
-            # strip off the data:img/png, part of the url
-            if screenshot.startswith("data:image/png;base64,"):
-                screenshots[i] = screenshot.split(",", 1)[1]
-
-        return screenshots
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index fe1fed13630..23c6cf23023 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -46,6 +46,7 @@ from .protocol import (AccessibilityProtocolPart,
                        DebugProtocolPart,
                        VirtualSensorProtocolPart,
                        DevicePostureProtocolPart,
+                       VirtualPressureSourceProtocolPart,
                        merge_dicts)
 
 
@@ -761,6 +762,20 @@ class MarionetteDevicePostureProtocolPart(DevicePostureProtocolPart):
         raise NotImplementedError("clear_device_posture not yet implemented")
 
 
+class MarionetteVirtualPressureSourceProtocolPart(VirtualPressureSourceProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def create_virtual_pressure_source(self, source_type, metadata):
+        raise NotImplementedError("create_virtual_pressure_source not yet implemented")
+
+    def update_virtual_pressure_source(self, source_type, sample):
+        raise NotImplementedError("update_virtual_pressure_source not yet implemented")
+
+    def remove_virtual_pressure_source(self, source_type):
+        raise NotImplementedError("remove_virtual_pressure_source not yet implemented")
+
+
 class MarionetteProtocol(Protocol):
     implements = [MarionetteBaseProtocolPart,
                   MarionetteTestharnessProtocolPart,
@@ -782,7 +797,8 @@ class MarionetteProtocol(Protocol):
                   MarionetteDebugProtocolPart,
                   MarionetteAccessibilityProtocolPart,
                   MarionetteVirtualSensorProtocolPart,
-                  MarionetteDevicePostureProtocolPart]
+                  MarionetteDevicePostureProtocolPart,
+                  MarionetteVirtualPressureSourceProtocolPart]
 
     def __init__(self, executor, browser, capabilities=None, timeout_multiplier=1, e10s=True, ccov=False):
         do_delayed_imports()
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 8a7adc5921e..3c1bdfd7a72 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -17,8 +17,10 @@ from .base import (AsyncCallbackHandler,
                    RefTestImplementation,
                    TestharnessExecutor,
                    TimedRunner,
+                   get_pages,
                    strip_server)
 from .protocol import (BaseProtocolPart,
+                       PrintProtocolPart,
                        TestharnessProtocolPart,
                        Protocol,
                        SelectorProtocolPart,
@@ -42,6 +44,7 @@ from .protocol import (BaseProtocolPart,
                        BidiScriptProtocolPart,
                        DevicePostureProtocolPart,
                        StorageProtocolPart,
+                       VirtualPressureSourceProtocolPart,
                        merge_dicts)
 
 from typing import List, Optional, Tuple
@@ -316,6 +319,53 @@ class WebDriverTestharnessProtocolPart(TestharnessProtocolPart):
                 pass
 
 
+class WebDriverPrintProtocolPart(PrintProtocolPart):
+    CM_PER_INCH = 2.54
+
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+        self.runner_handle = None
+
+    def load_runner(self):
+        url = urljoin(self.parent.executor.server_url("http"), "/print_pdf_runner.html")
+        self.logger.debug("Loading %s" % url)
+        try:
+            self.webdriver.url = url
+        except Exception as e:
+            self.logger.critical(
+                "Loading initial page %s failed. Ensure that the "
+                "there are no other programs bound to this port and "
+                "that your firewall rules or network setup does not "
+                "prevent access.\n%s" % (url, traceback.format_exc(e)))
+            raise
+        self.runner_handle = self.webdriver.window_handle
+
+    def render_as_pdf(self, width, height):
+        # All units passed to `print()` are in cm. See [0] for testing specifications.
+        #
+        # [0]: https://web-platform-tests.org/writing-tests/print-reftests.html
+        margin = 0.5 * self.CM_PER_INCH
+        pdf_base64 = self.webdriver.print(page={"width": width, "height": height},
+                                          margin={"top": margin, "right": margin, "bottom": margin,
+                                                  "left": margin},
+                                          background=True,
+                                          shrink_to_fit=False)
+        return pdf_base64
+
+    def pdf_to_png(self, pdf_base64, ranges):
+        handle = self.webdriver.window_handle
+        self.webdriver.window_handle = self.runner_handle
+        try:
+            rv = self.webdriver.execute_async_script("""
+let callback = arguments[arguments.length - 1];
+render('%s').then(result => callback(result))""" % pdf_base64)
+            page_numbers = get_pages(ranges, len(rv))
+            rv = [item for i, item in enumerate(rv) if i + 1 in page_numbers]
+            return rv
+        finally:
+            self.webdriver.window_handle = handle
+
+
 class WebDriverSelectorProtocolPart(SelectorProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -380,6 +430,7 @@ class WebDriverWindowProtocolPart(WindowProtocolPart):
         self.logger.info("Getting rect")
         return self.webdriver.window.rect
 
+
 class WebDriverSendKeysProtocolPart(SendKeysProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -486,6 +537,7 @@ class WebDriverSPCTransactionsProtocolPart(SPCTransactionsProtocolPart):
         body = {"mode": mode}
         return self.webdriver.send_session_command("POST", "secure-payment-confirmation/set-mode", body)
 
+
 class WebDriverRPHRegistrationsProtocolPart(RPHRegistrationsProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -494,6 +546,7 @@ class WebDriverRPHRegistrationsProtocolPart(RPHRegistrationsProtocolPart):
         body = {"mode": mode}
         return self.webdriver.send_session_command("POST", "custom-handlers/set-mode", body)
 
+
 class WebDriverFedCMProtocolPart(FedCMProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -550,6 +603,7 @@ class WebDriverVirtualSensorPart(VirtualSensorProtocolPart):
     def get_virtual_sensor_information(self, sensor_type):
         return self.webdriver.send_session_command("GET", "sensor/%s" % sensor_type)
 
+
 class WebDriverDevicePostureProtocolPart(DevicePostureProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -561,6 +615,7 @@ class WebDriverDevicePostureProtocolPart(DevicePostureProtocolPart):
     def clear_device_posture(self):
         return self.webdriver.send_session_command("DELETE", "deviceposture")
 
+
 class WebDriverStorageProtocolPart(StorageProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -568,9 +623,28 @@ class WebDriverStorageProtocolPart(StorageProtocolPart):
     def run_bounce_tracking_mitigations(self):
         return self.webdriver.send_session_command("DELETE", "storage/run_bounce_tracking_mitigations")
 
+
+class WebDriverVirtualPressureSourceProtocolPart(VirtualPressureSourceProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def create_virtual_pressure_source(self, source_type, metadata):
+        body = {"type": source_type}
+        body.update(metadata)
+        return self.webdriver.send_session_command("POST", "pressuresource", body)
+
+    def update_virtual_pressure_source(self, source_type, sample):
+        body = {"sample": sample}
+        return self.webdriver.send_session_command("POST", "pressuresource/%s" % source_type, body)
+
+    def remove_virtual_pressure_source(self, source_type):
+        return self.webdriver.send_session_command("DELETE", "pressuresource/%s" % source_type)
+
+
 class WebDriverProtocol(Protocol):
     enable_bidi = False
     implements = [WebDriverBaseProtocolPart,
+                  WebDriverPrintProtocolPart,
                   WebDriverTestharnessProtocolPart,
                   WebDriverSelectorProtocolPart,
                   WebDriverAccessibilityProtocolPart,
@@ -589,7 +663,8 @@ class WebDriverProtocol(Protocol):
                   WebDriverDebugProtocolPart,
                   WebDriverVirtualSensorPart,
                   WebDriverDevicePostureProtocolPart,
-                  WebDriverStorageProtocolPart]
+                  WebDriverStorageProtocolPart,
+                  WebDriverVirtualPressureSourceProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
         super().__init__(executor, browser)
@@ -1027,6 +1102,51 @@ class WebDriverRefTestExecutor(RefTestExecutor):
         return screenshot
 
 
+class WebDriverPrintRefTestExecutor(WebDriverRefTestExecutor):
+    is_print = True
+
+    def setup(self, runner, protocol=None):
+        super().setup(runner, protocol)
+        self.protocol.pdf_print.load_runner()
+        self.has_window = False
+        with open(os.path.join(here, "reftest.js")) as f:
+            self.script = f.read()
+
+    def screenshot(self, test, viewport_size, dpi, page_ranges):
+        # https://github.com/web-platform-tests/wpt/issues/7140
+        assert dpi is None
+
+        if not self.has_window:
+            self.protocol.base.execute_script(self.script)
+            self.protocol.base.set_window(self.protocol.webdriver.handles[-1])
+            self.has_window = True
+
+        self.viewport_size = viewport_size
+        self.page_ranges = page_ranges.get(test.url)
+        timeout = self.timeout_multiplier * test.timeout if self.debug_info is None else None
+        test_url = self.test_url(test)
+
+        return WebDriverRun(self.logger,
+                            self._render,
+                            self.protocol,
+                            test_url,
+                            timeout,
+                            self.extra_timeout).run()
+
+    def _render(self, protocol, url, timeout):
+        protocol.webdriver.url = url
+        protocol.base.execute_script(self.wait_script, asynchronous=True)
+
+        pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
+        screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
+        for i, screenshot in enumerate(screenshots):
+            # strip off the data:img/png, part of the url
+            if screenshot.startswith("data:image/png;base64,"):
+                screenshots[i] = screenshot.split(",", 1)[1]
+
+        return screenshots
+
+
 class WebDriverCrashtestExecutor(CrashtestExecutor):
     protocol_cls = WebDriverProtocol
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
index eb97a805415..f25694426ec 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -940,3 +940,21 @@ class DevicePostureProtocolPart(ProtocolPart):
     @abstractmethod
     def clear_device_posture(self):
         pass
+
+class VirtualPressureSourceProtocolPart(ProtocolPart):
+    """Protocol part for Virtual Pressure Source"""
+    __metaclass__ = ABCMeta
+
+    name = "pressure"
+
+    @abstractmethod
+    def create_virtual_pressure_source(self, source_type, metadata):
+        pass
+
+    @abstractmethod
+    def update_virtual_pressure_source(self, source_type, sample):
+        pass
+
+    @abstractmethod
+    def remove_virtual_pressure_source(self, source_type):
+        pass
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
index f7b9ae5fdbf..80abe67b021 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -383,14 +383,26 @@
     };
 
     window.test_driver_internal.set_device_posture = function(posture, context=null) {
-        return create_context_action("set_device_posture", {posture, context});
+        return create_context_action("set_device_posture", context, {posture});
     };
 
     window.test_driver_internal.clear_device_posture = function(context=null) {
-        return create_context_action("clear_device_posture", {context});
+        return create_context_action("clear_device_posture", context, {});
     };
 
     window.test_driver_internal.run_bounce_tracking_mitigations = function (context = null) {
-        return create_action("run_bounce_tracking_mitigations", {context});
+        return create_context_action("run_bounce_tracking_mitigations", context, {});
+    };
+
+    window.test_driver_internal.create_virtual_pressure_source = function(source_type, metadata={}, context=null) {
+        return create_context_action("create_virtual_pressure_source", context, {source_type, metadata});
+    };
+
+    window.test_driver_internal.update_virtual_pressure_source = function(source_type, sample, context=null) {
+        return create_context_action("update_virtual_pressure_source", context, {source_type, sample});
+    };
+
+    window.test_driver_internal.remove_virtual_pressure_source = function(source_type, context=null) {
+        return create_context_action("remove_virtual_pressure_source", context, {source_type});
     };
 })();
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
index 65f6b2b673a..5969f4ed60e 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
@@ -619,12 +619,28 @@ class PathGroupedSource(TestQueueBuilder):
         state["prev_group_key"] = (subsuite, test_type, path)
         return rv
 
+    def in_one_group(self,
+                     subsuite: str,
+                     tests: List[wpttest.Test]) -> bool:
+        small_subsuite_size = self.kwargs.get("small_subsuite_size", 0)
+        return len(subsuite) > 0 and len(tests) <= small_subsuite_size
+
     def make_groups(self, tests_by_type: TestsByType) -> List[TestGroup]:
         groups = []
         state: MutableMapping[str, Any] = {}
         for (subsuite, test_type), tests in tests_by_type.items():
+            # For subsuites only have few tests, put them in one group so that
+            # it will be picked up by one worker and only one restart will be
+            # needed. Tests have a different test type will still be put into
+            # different group though.
+            in_one_group = self.in_one_group(subsuite, tests)
+            if in_one_group:
+                state["prev_group_key"] = (subsuite, test_type, [""])
+                group_metadata = self.group_metadata(state)
+                groups.append(TestGroup(deque(), subsuite, test_type, group_metadata))
+
             for test in tests:
-                if self.new_group(state, subsuite, test_type, test):
+                if not in_one_group and self.new_group(state, subsuite, test_type, test):
                     group_metadata = self.group_metadata(state)
                     groups.append(TestGroup(deque(), subsuite, test_type, group_metadata))
                 group, _, _, metadata = groups[-1]
@@ -636,10 +652,13 @@ class PathGroupedSource(TestQueueBuilder):
         groups = defaultdict(list)
         state: MutableMapping[str, Any] = {}
         for (subsuite, test_type), tests in tests_by_type.items():
+            in_one_group = self.in_one_group(subsuite, tests)
             for test in tests:
-                if self.new_group(state, subsuite, test_type, test):
+                if not in_one_group and self.new_group(state, subsuite, test_type, test):
                     group = self.group_metadata(state)['scope']
-                if subsuite:
+                if in_one_group:
+                    group_name = f"{subsuite}:/"
+                elif subsuite:
                     group_name = f"{subsuite}:{group}"
                 else:
                     group_name = group
@@ -651,6 +670,11 @@ class PathGroupedSource(TestQueueBuilder):
 
 
 class FullyParallelGroupedSource(PathGroupedSource):
+    def in_one_group(self,
+                     subsuite: str,
+                     tests: List[wpttest.Test]) -> bool:
+        return False
+
     # Chuck every test into a different group, so that they can run
     # fully parallel with each other. Useful to run a lot of tests
     # clustered in a few directories.
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
index 0d982f85772..e84f5df1992 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -957,7 +957,8 @@ class TestRunnerManager(threading.Thread):
             self._ensure_runner_stopped()
             # TODO(web-platform-tests/wpt#48030): Consider removing the
             # `stop(force=...)` argument.
-            self.browser.stop(force=True)
+            if self.browser:
+                self.browser.stop(force=True)
         except (OSError, PermissionError):
             self.logger.error("Failed to stop either the runner or the browser process",
                               exc_info=True)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
index 3d1a6cf60af..e45ed0807f6 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -150,6 +150,9 @@ scheme host and port.""")
     # TODO use an empty string argument for the default subsuite
     test_selection_group.add_argument("--subsuite", action="append", dest="subsuites",
                                       help="Subsuite names to run. Runs all subsuites when omitted.")
+    test_selection_group.add_argument("--small-subsuite-size", default=50, type=int,
+                                      help="Maximum number of tests a subsuite can have to be treated as small subsuite."
+                                      "Tests from a small subsuite will be grouped in one group.")
     test_selection_group.add_argument("--include", action="append",
                                       help="URL prefix to include")
     test_selection_group.add_argument("--include-file", action="store",
diff --git a/tests/wpt/tests/webauthn/getclientcapabilities.https.html b/tests/wpt/tests/webauthn/getclientcapabilities.https.html
new file mode 100644
index 00000000000..86938202198
--- /dev/null
+++ b/tests/wpt/tests/webauthn/getclientcapabilities.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>getClientCapabilities tests</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=helpers.js></script>
+<body></body>
+<script>
+"use strict";
+
+const KNOWN_CAPABILITIES = [
+  "conditionalCreate",
+  "conditionalGet",
+  "hybridTransport",
+  "passkeyPlatformAuthenticator",
+  "relatedOrigins",
+  "signalAllAcceptedCredentials",
+  "signalCurrentUserDetails",
+  "signalUnknownCredential",
+  "userVerifyingPlatformAuthenticator",
+];
+
+promise_test(async t => {
+  const capabilities = await PublicKeyCredential.getClientCapabilities();
+  assert_array_equals(Object.keys(capabilities), KNOWN_CAPABILITIES);
+  for (let capability of KNOWN_CAPABILITIES) {
+    assert_equals(typeof capabilities[capability], "boolean");
+  }
+}, "Known capabilities are reported and are sorted");
+
+</script>
diff --git a/tests/wpt/tests/webcodecs/README.md b/tests/wpt/tests/webcodecs/README.md
index 39b829b158f..e6cae317d0b 100644
--- a/tests/wpt/tests/webcodecs/README.md
+++ b/tests/wpt/tests/webcodecs/README.md
@@ -120,6 +120,12 @@ sox -n -r 48000 sfx.wav synth 1 sine 480
 ffmpeg -i sfx.wav -frames:a 10 -acodec libmp3lame -b:a 96K sfx.mp3
 ```
 
+### sfx.flac
+```
+sox -n -r 48000 sfx.wav synth 1 sine 480
+ffmpeg -i sfx.wav -frames:a 10 sfx.flac
+```
+
 ### sfx-aac.mp4
 ```
 sox -n -r 48000 sfx.wav synth 1 sine 480
diff --git a/tests/wpt/tests/webcodecs/audio-decoder.https.any.js b/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
index fd828d48157..471e0e4ad02 100644
--- a/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
@@ -67,41 +67,7 @@ const invalidConfigs = [
       codec: 'opus',
       sampleRate: 8000,
       numberOfChannels: 1,
-      description: detachedArrayBuffer
-    },
-  },
-  {
-    comment: 'Vorbis without description',
-    config: {
-      codec: 'vorbis',
-      sampleRate: 48000,
-      numberOfChannels: 2,
-    },
-  },
-  {
-    comment: 'Vorbis with empty description',
-    config: {
-      codec: 'vorbis',
-      sampleRate: 48000,
-      numberOfChannels: 2,
-      description: emptyArrayBuffer,
-    },
-  },
-  {
-    comment: 'Flac without description',
-    config: {
-      codec: 'flac',
-      sampleRate: 48000,
-      numberOfChannels: 2,
-    },
-  },
-  {
-    comment: 'Flac with empty description',
-    config: {
-      codec: 'flac',
-      sampleRate: 48000,
-      numberOfChannels: 2,
-      description: emptyArrayBuffer,
+      description: detachedArrayBuffer,
     },
   },
 ];
@@ -180,6 +146,27 @@ const validButUnsupportedConfigs = [
   },
 ];
 
+// Those configurations are supported, but attempting to configure an
+// AudioDecoder will fail, because `description` is invalid for this particular
+// codec
+var supportedButErrorOnConfiguration = [
+  {
+    comment: 'Opus with more than two channels and without description',
+    config: {
+      codec: 'opus',
+      sampleRate: '48000',
+      numberOfChannels: 3,
+    },
+  },
+  {
+    comment: 'Opus with more than two channels and with a description that is too short',
+    config: {
+      codec: 'opus',
+      sampleRate: '48000',
+      numberOfChannels: 3,
+      description: new Uint8Array(9), // at least 10 bytes are required for multichannel
+    },
+  },
 validButUnsupportedConfigs.forEach(entry => {
   promise_test(
       t => {
@@ -191,10 +178,14 @@ validButUnsupportedConfigs.forEach(entry => {
           entry.comment);
 });
 
-validButUnsupportedConfigs.forEach(entry => {
+var shouldError = validButUnsupportedConfigs.concat(supportedButErrorOnConfiguration);
+
+shouldError.forEach(entry => {
   promise_test(
       t => {
         let isErrorCallbackCalled = false;
+        let supported = AudioDecoder.isConfigSupported(entry.config);
+        assert_implements_optional(supported, entry.config.codec + ' unsupported');
         let codec = new AudioDecoder({
           output: t.unreached_func('unexpected output'),
           error: t.step_func_done(e => {
diff --git a/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
index f032b0fe59a..6a4793c62c9 100644
--- a/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
+++ b/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
@@ -11,6 +11,7 @@
 // META: variant=?pcm_s24
 // META: variant=?pcm_s32
 // META: variant=?pcm_f32
+// META: variant=?flac
 
 const ADTS_AAC_DATA = {
   src: 'sfx.adts',
@@ -87,6 +88,22 @@ const OPUS_DATA = {
   duration: 20000
 };
 
+const FLAC_DATA = {
+  src: 'sfx.flac',
+  config: {
+    codec: 'flac',
+    sampleRate: 48000,
+    numberOfChannels: 1,
+    description: { offset: 0, size: 8287 }
+  },
+  chunks: [
+    { offset: 8288, size: 2276 },
+    { offset: 10564, size: 2038 },
+    { offset: 12602, size: 521 },
+  ],
+  duration: 20000
+};
+
 function pcm(codec, dataOffset) {
   return {
     src: `sfx-${codec}.wav`,
@@ -153,6 +170,7 @@ promise_setup(async () => {
     '?pcm_s24': PCM_S24_DATA,
     '?pcm_s32': PCM_S32_DATA,
     '?pcm_f32': PCM_F32_DATA,
+    '?flac': FLAC_DATA,
   }[location.search];
 
   // Don't run any tests if the codec is not supported.
diff --git a/tests/wpt/tests/webcodecs/sfx.flac b/tests/wpt/tests/webcodecs/sfx.flac
new file mode 100644
index 0000000000000000000000000000000000000000..a8d313c562573d66a0e072aae4c70ba11480908c
GIT binary patch
literal 13123
zcmeI$Z%ou?90%~q?!|Khx0X{Vnb~NI)#-`XbHR}9woq!rwDVuQ9iX6B?r?4}HViXx
z^B*a!H|ho=Scb!C%;Js!0t$*CdMWCO%G`#8U4&#RWFX>nfK$<RFZXV*OqM)N`lipX
z$@lkp+UIGSDL4}m1R=wba0Cf4BH&i&N#q`a%ty4^`htnjZ)e}L#;2OszX=Qo5<62b
z6`Y@C##v&SxLC$wnW0~pt)K3XGjd$+T-(0}cO%jI5Imp&6o3Ly017|>C;$bZ02F`%
zPyh-*0Vn_kpa2wr0#E=7KmjNK1)u;FfC5ke3P6GXyTG%DsQ}q6AP6v`FGfCjt#{s@
z#jg$#<k)EcJHIb&#KzC$?=m0!$lcnovDf1}UF)m$wM~uMZ%>Wg-hx?423Ir+ml#<@
zi-|CP2?nzIy@y?o*DvZQcv^eIek0AEX7B4vZCKoyvoOh9hRIqcfop`4h)N6)8C6cq
zy!@VN-mm@HqkR+UBlROAzLENlN4@#mALplXf~@cq1I`m+A}$efBBp5UD{<lnRc~MK
z&Png|P1(0O><)Y0`1RWE@!+MONEatEQ8Lef3{)e+SX{{@(f(!=7np2WUobK4Xsc~&
z^R?AB>^PCWamT>>WhRos<jX80C*s8f5K%3IL5r`b-_Wa0GzI$_Mml=adVB4?X`Tt+
z{l}B{kIPjUuJ9tJu(-y6M6{TSlBKvT?V5FaUFAT>PWxTo-FjcWZ*;KEv460&;s|$9
z*2E>KBBJLBnboE6%N)_1Nqfu3vRWoaA2sAT^78C?j`Zmd+s{n5*O4^GQ<y4cpv6oW
zt2ZH^7m1nG%o_rn1UL!sO@MC#T#n$L0QZFdyfIrsF8uS2GoyH=&Bs-&cx%mm$HBCf
z;&+?(48<Jk3;v1DdbyhT!uI3tjk{tviA7}+m7?VYP>6vT5{vfEBD*6OcGd)YvYY$c
z2d;W<9;i9&I+7%p$}DDJQ3(SC$`S^NjloDMMZCT3K`?);#j~`!zvuI<<-Z8~yjVB}
z*l3wW3kd@Wxad-uD~wrPV%|{y)RSXt>B)THi68$ex4^r%j3ikCaC$k)MN0`l((f$g
zzQo)m6@xw5!!7-H268sr{<ykojdg7dm&6gEkN_-@P?<mrSt1;ivF66y(|?V%PX=w(
zSMCg-i4Tm>%Q@K#Bm&jT6VO7;K%z+;nGimIS!Jwar>(UnxVbsM<G|E~cpDc;D#Hj=
zBK2}WqHMIp8iABVE(1+nm&S)%9t5){bCx#OJRF{PwCeS6GDf#bKqbP!0uGfE2-Isx
zIuwz7D(%VSfG4}=%FyK2!8x}kOmj&N(n4DJ)WQV;E(ma~eGc1LDL?(}p$~-I6tcoU
zS+MomwvhaG&!g?9hZe8<TC8h*A%68srDuoF&N-&0I4zBqD%NRHDol|y>JP|)GH)eM
znH65(7wP{uV(A4dutKZm?~=MIO`&Ewf;P<;Xl(Cc@s=M?VWO;z^`ho3lLK<s_Y_v7
zb-gQE_+&NtnA+rbx+TBncN-<Yb)B$5O$?<enx|86rHP4R@Z*|jIjR0&=0Ue9G{O{-
zESQg}$*OS3qVmhVCFQ{B(p(p{ZVJ-_(Nu)0@R6q3bLDeUqEqyX-Nqt4kjc1@Hi5tz
zCf6BeR+TEe$|dT7T$=bZCi{OAk2K<xSuiIHdZ&6I(P@?Z&Zq@+tUwf%W95`d?^F+@
zDybraZxGg1QU<rTsKi*Jcd7>x=+&w~&E>iRlBG$sx<tKGJy1DTBJfnG_shN7CZ*BR
z=w$Rx^*~<flF2B!j;g0D#SsE8D1zRp9!O-i$eQz0W^J;9Rnie=TJQ9E&~G}2{|$S9
BTm%3B

literal 0
HcmV?d00001

diff --git a/tests/wpt/tests/webcodecs/video-decoder.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
index 5b3193b8c37..6b77aeae545 100644
--- a/tests/wpt/tests/webcodecs/video-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
@@ -78,6 +78,10 @@ const validButUnsupportedConfigs = [
     comment: 'Possible future H264 codec string',
     config: {codec: 'avc1.FF000b'},
   },
+  {
+    comment: 'Possible future H264 codec string (level 2.9)',
+    config: {codec: 'avc1.4D401D'},
+  },
   {
     comment: 'Possible future HEVC codec string',
     config: {codec: 'hvc1.C99.6FFFFFF.L93'},
@@ -151,17 +155,35 @@ const validConfigs = [
     comment: 'valid codec with spaces',
     config: {codec: '  vp09.00.10.08  '},
   },
+  {
+    comment: 'variant 1 of h264 codec string',
+    config: {codec: 'avc3.42001E'},
+  },
+  {
+    comment: 'variant 2 of h264 codec string',
+    config: {codec: 'avc1.42001E'},
+  },
 ];  // validConfigs
 
 validConfigs.forEach(entry => {
-  promise_test(
-    async t => {
-      try {
-        await VideoDecoder.isConfigSupported(entry.config);
-      } catch (e) {
-        assert_true(false, entry.comment + ' should not throw');
-      }
-    },
-    'Test that VideoDecoder.isConfigSupported() accepts config:' +
-        entry.comment);
+  promise_test(async t => {
+    try {
+      await VideoDecoder.isConfigSupported(entry.config);
+      var decoder = new VideoDecoder(getDefaultCodecInit(t));
+      // Something that works with all codecs:
+      entry.config.width = 1280;
+      entry.config.height = 720;
+      decoder.configure(entry.config);
+      return decoder
+        .flush()
+        .then(
+          t.step_func(e => {
+            assert_equals(decoder.state, 'configured', 'codec is configured');
+          })
+        )
+        .catch(t.unreached_func('flush succeeded unexpectedly'));
+    } catch (e) {
+      assert_true(false, entry.comment + ' should not throw');
+    }
+  }, 'Test that VideoDecoder.isConfigSupported() accepts config:' + entry.comment);
 });
diff --git a/tests/wpt/tests/webdriver/tests/bidi/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
index c42b5f3e501..ba982d1dc64 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
@@ -75,6 +75,14 @@ def int_interval(start: int, end: int) -> Callable[[Any], None]:
     return _
 
 
+def number_interval(start: float, end: float) -> Callable[[Any], None]:
+    def _(actual: Any) -> None:
+        any_number(actual)
+        assert start <= actual <= end
+
+    return _
+
+
 def assert_cookies(cookies, expected_cookies):
     assert len(cookies) == len(expected_cookies)
 
@@ -141,8 +149,9 @@ async def get_element_dimensions(bidi_session, context, element):
     return remote_mapping_to_dict(result["value"])
 
 
-async def get_viewport_dimensions(bidi_session, context: str, with_scrollbar: bool = True):
-    if with_scrollbar == True:
+async def get_viewport_dimensions(bidi_session, context: str,
+      with_scrollbar: bool = True, quirk_mode: bool = False):
+    if with_scrollbar:
         expression = """
             ({
                 height: window.innerHeight,
@@ -150,11 +159,17 @@ async def get_viewport_dimensions(bidi_session, context: str, with_scrollbar: bo
             });
         """
     else:
-        expression = """
-            ({
-                height: document.documentElement.clientHeight,
-                width: document.documentElement.clientWidth,
-            });
+        # The way the viewport height without the scrollbar can be calculated
+        # is different in quirks mode. In quirks mode, the viewport height is
+        # the height of the body element, while in standard mode it is the
+        # height of the document element.
+        element_expression = \
+            "document.body" if quirk_mode else "document.documentElement"
+        expression = f"""
+            ({{
+                height: {element_expression}.clientHeight,
+                width: {element_expression}.clientWidth,
+            }});
         """
     result = await bidi_session.script.evaluate(
         expression=expression,
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/viewport.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/viewport.py
index e9ff8517f26..15e3dd5688f 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/viewport.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/viewport.py
@@ -197,8 +197,8 @@ async def test_persists_on_reload(bidi_session, inline, new_tab):
     ids=["horizontal", "vertical", "both"],
 )
 @pytest.mark.parametrize(
-    "doctype",
-    ["html", "html_quirks"],
+    "quirk_mode",
+    [False, True],
     ids=["standard", "quirks"],
 )
 async def test_with_scrollbars(
@@ -207,9 +207,11 @@ async def test_with_scrollbars(
     new_tab,
     use_horizontal_scrollbar,
     use_vertical_scrollbar,
-    doctype,
+    quirk_mode,
 ):
-    viewport_dimensions = await get_viewport_dimensions(bidi_session, new_tab)
+    doctype = "html_quirks" if quirk_mode else "html"
+    viewport_dimensions = await get_viewport_dimensions(bidi_session, new_tab,
+                                                        quirk_mode=quirk_mode)
 
     width = 100
     if use_horizontal_scrollbar:
@@ -228,16 +230,18 @@ async def test_with_scrollbars(
 
     test_viewport = {"width": 499, "height": 599}
 
-    assert await get_viewport_dimensions(bidi_session, new_tab) != test_viewport
+    assert await get_viewport_dimensions(bidi_session, new_tab,
+                                         quirk_mode=quirk_mode) != test_viewport
 
     await bidi_session.browsing_context.set_viewport(
         context=new_tab["context"], viewport=test_viewport
     )
 
-    assert await get_viewport_dimensions(bidi_session, new_tab) == test_viewport
+    assert await get_viewport_dimensions(bidi_session, new_tab,
+                                         quirk_mode=quirk_mode) == test_viewport
 
     viewport_without_scrollbar = await get_viewport_dimensions(
-        bidi_session, new_tab, with_scrollbar=False
+        bidi_session, new_tab, with_scrollbar=False, quirk_mode=quirk_mode
     )
 
     # The side which has scrollbar takes up space on the other side
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/context.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/context.py
index 2635dcfa287..d603f462b79 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/context.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/context.py
@@ -26,30 +26,3 @@ async def test_top_level_contexts(
 
     await wait_for_url(top_context["context"], pages[1])
     await wait_for_url(new_tab["context"], pages[0])
-
-
-@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
-async def test_iframe(bidi_session, current_url, wait_for_url, new_tab, inline, domain):
-    iframe_url_1 = inline("page 1")
-    page_url = inline(f"<iframe src='{iframe_url_1}'></iframe>", domain=domain)
-
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"], url=page_url, wait="complete"
-    )
-    assert await current_url(new_tab["context"]) == page_url
-
-    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
-    iframe_context = contexts[0]["children"][0]
-
-    iframe_url_2 = inline("page 2")
-    await bidi_session.browsing_context.navigate(
-        context=iframe_context["context"], url=iframe_url_2, wait="complete"
-    )
-    assert await current_url(iframe_context["context"]) == iframe_url_2
-
-    await bidi_session.browsing_context.traverse_history(
-        context=iframe_context["context"], delta=-1
-    )
-
-    await wait_for_url(new_tab["context"], page_url)
-    await wait_for_url(iframe_context["context"], iframe_url_1)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/invalid.py
index c6a90601e70..ddbe179fabd 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/traverse_history/invalid.py
@@ -42,3 +42,21 @@ async def test_delta_invalid_value(bidi_session, current_url, new_tab, inline, v
         await bidi_session.browsing_context.traverse_history(
             context=new_tab["context"], delta=value
         )
+
+
+async def test_iframe(bidi_session, current_url, wait_for_url, new_tab, inline):
+    iframe_url_1 = inline("page 1")
+    page_url = inline(f"<iframe src='{iframe_url_1}'></iframe>")
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=page_url, wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(
+        root=new_tab["context"])
+    iframe_context = contexts[0]["children"][0]
+
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.browsing_context.traverse_history(
+            context=iframe_context["context"], delta=-1
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
index 7077d7bba46..87d204f0b1e 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
@@ -316,3 +316,62 @@ async def test_move_to_position_in_viewport(
 
     events = await get_events(bidi_session, top_context["context"])
     assert len(events) == event_count
+
+
+@pytest.mark.parametrize("origin", ["viewport", "pointer", "element"])
+async def test_move_to_origin_position_within_frame(
+    bidi_session, get_element, iframe, inline, top_context, origin
+):
+    url = inline(
+        iframe(
+            """
+        <textarea style="width: 100px; height: 40px"></textarea>
+        <script>
+            "use strict;"
+
+            var allEvents = { events: [] };
+            window.addEventListener("mousemove", e => {
+                allEvents.events.push([
+                    e.clientX,
+                    e.clientY,
+                ]);
+            });
+        </script>
+    """
+        )
+    )
+
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=url,
+        wait="complete",
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=top_context["context"])
+    iframe = contexts[0]["children"][0]
+
+    elem = await get_element("textarea", context=iframe)
+    elem_center_point = await get_inview_center_bidi(
+        bidi_session, context=iframe, element=elem
+    )
+
+    offset = [10, 5]
+
+    if origin == "element":
+        origin = get_element_origin(elem)
+        target_point = [
+            elem_center_point["x"] + offset[0],
+            elem_center_point["y"] + offset[1],
+        ]
+    else:
+        target_point = offset
+
+    actions = Actions()
+    actions.add_pointer().pointer_move(x=offset[0], y=offset[1], origin=origin)
+
+    await bidi_session.input.perform_actions(actions=actions, context=iframe["context"])
+
+    events = await get_events(bidi_session, iframe["context"])
+
+    assert len(events) == 1
+    assert events[0] == target_point
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
index 41ddbbbff09..95697d4dff7 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
@@ -19,6 +19,7 @@ from webdriver.bidi.modules.network import (
 
 from datetime import datetime, timedelta, timezone
 
+
 def assert_bytes_value(bytes_value):
     assert bytes_value["type"] in ["string", "base64"]
     any_string(bytes_value["value"])
@@ -32,28 +33,45 @@ def assert_headers(event_headers, expected_headers):
         assert next(h for h in event_headers if header == h) is not None
 
 
-def assert_timing_info(timing_info):
+def assert_timing_info(timing_info, expected_time_range=None):
+    # First assert time origin, which is reused to assert the following values.
+    time_origin = timing_info.get("timeOrigin")
+    any_number(time_origin)
+
+    def assert_timing(actual):
+        # Check that the timing is a number
+        any_number(actual)
+
+        # If a time range was provided, assert that the time is within the
+        # provided bounds.
+        # Unless timing is 0, which means the timing is not relevant for the
+        # current network event, or is not known yet.
+        if expected_time_range is not None and actual != 0:
+            # Add time_origin to actual to get the absolute time corresponding
+            # to the timing.
+            expected_time_range(actual + time_origin)
+
+    # Assert all other timings.
     recursive_compare(
         {
-            "timeOrigin": any_number,
-            "requestTime": any_number,
-            "redirectStart": any_number,
-            "redirectEnd": any_number,
-            "fetchStart": any_number,
-            "dnsStart": any_number,
-            "dnsEnd": any_number,
-            "connectStart": any_number,
-            "connectEnd": any_number,
-            "tlsStart": any_number,
-            "requestStart": any_number,
-            "responseStart": any_number,
-            "responseEnd": any_number,
+            "requestTime": assert_timing,
+            "redirectStart": assert_timing,
+            "redirectEnd": assert_timing,
+            "fetchStart": assert_timing,
+            "dnsStart": assert_timing,
+            "dnsEnd": assert_timing,
+            "connectStart": assert_timing,
+            "connectEnd": assert_timing,
+            "tlsStart": assert_timing,
+            "requestStart": assert_timing,
+            "responseStart": assert_timing,
+            "responseEnd": assert_timing,
         },
         timing_info,
     )
 
 
-def assert_request_data(request_data, expected_request):
+def assert_request_data(request_data, expected_request, expected_time_range):
     recursive_compare(
         {
             "bodySize": any_int_or_null,
@@ -68,8 +86,6 @@ def assert_request_data(request_data, expected_request):
         request_data,
     )
 
-    assert_timing_info(request_data["timings"])
-
     for cookie in request_data["cookies"]:
         assert_bytes_value(cookie["value"])
 
@@ -89,6 +105,8 @@ def assert_request_data(request_data, expected_request):
         # Remove headers before using recursive_compare, see comment for cookies
         del expected_request["headers"]
 
+    assert_timing_info(request_data["timings"], expected_time_range)
+
     recursive_compare(expected_request, request_data)
 
 
@@ -100,6 +118,7 @@ def assert_base_parameters(
     navigation=None,
     redirect_count=None,
     expected_request=None,
+    expected_time_range=None,
 ):
     recursive_compare(
         {
@@ -136,9 +155,9 @@ def assert_base_parameters(
     if redirect_count is not None:
         assert event["redirectCount"] == redirect_count
 
-    # Assert request data
+    # Assert request data (expected_time_range is optional)
     if expected_request is not None:
-        assert_request_data(event["request"], expected_request)
+        assert_request_data(event["request"], expected_request, expected_time_range)
 
 
 def assert_before_request_sent_event(
@@ -149,6 +168,7 @@ def assert_before_request_sent_event(
     navigation=None,
     redirect_count=None,
     expected_request=None,
+    expected_time_range=None,
 ):
     # Assert initiator
     assert isinstance(event["initiator"], dict)
@@ -163,6 +183,7 @@ def assert_before_request_sent_event(
         navigation=navigation,
         redirect_count=redirect_count,
         expected_request=expected_request,
+        expected_time_range=expected_time_range,
     )
 
 
@@ -175,6 +196,7 @@ def assert_fetch_error_event(
     navigation=None,
     redirect_count=None,
     expected_request=None,
+    expected_time_range=None,
 ):
     # Assert errorText
     assert isinstance(event["errorText"], str)
@@ -191,6 +213,7 @@ def assert_fetch_error_event(
         navigation=navigation,
         redirect_count=redirect_count,
         expected_request=expected_request,
+        expected_time_range=expected_time_range,
     )
 
 
@@ -241,6 +264,7 @@ def assert_response_event(
     redirect_count=None,
     expected_request=None,
     expected_response=None,
+    expected_time_range=None,
 ):
     # Assert response data
     any_dict(event["response"])
@@ -256,6 +280,7 @@ def assert_response_event(
         navigation=navigation,
         redirect_count=redirect_count,
         expected_request=expected_request,
+        expected_time_range=expected_time_range,
     )
 
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py b/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
index 8ae53905642..a23821f2ae7 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
@@ -5,6 +5,7 @@ from webdriver.error import TimeoutException
 
 from tests.support.sync import AsyncPoll
 
+from ... import number_interval
 from .. import (
     assert_response_event,
     AUTH_REQUIRED_EVENT,
@@ -87,6 +88,53 @@ async def test_no_authentication(
     remove_listener()
 
 
+@pytest.mark.asyncio
+async def test_request_timing_info(
+    bidi_session,
+    new_tab,
+    wait_for_event,
+    wait_for_future_safe,
+    url,
+    fetch,
+    setup_network_test,
+    current_time,
+):
+    network_events = await setup_network_test(
+        events=[AUTH_REQUIRED_EVENT], context=new_tab["context"]
+    )
+    events = network_events[AUTH_REQUIRED_EVENT]
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    auth_url = url(
+        "/webdriver/tests/support/http_handlers/authentication.py?realm=testrealm"
+    )
+
+    on_auth_required = wait_for_event(AUTH_REQUIRED_EVENT)
+    asyncio.ensure_future(fetch(url=auth_url, context=new_tab))
+    await wait_for_future_safe(on_auth_required)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
+    assert len(events) == 1
+    expected_request = {"method": "GET", "url": auth_url}
+    expected_response = {
+        "url": auth_url,
+        "authChallenges": [
+            ({"scheme": "Basic", "realm": "testrealm"}),
+        ],
+    }
+    assert_response_event(
+        events[0],
+        expected_request=expected_request,
+        expected_response=expected_response,
+        expected_time_range=time_range,
+        redirect_count=0,
+    )
+
+
 @pytest.mark.asyncio
 async def test_with_wrong_credentials(setup_blocked_request, bidi_session):
     # Setup unique username / password because browsers cache credentials.
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
index f8d1f7ba786..be2634fc6a9 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
@@ -6,6 +6,7 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
+from ... import number_interval
 from .. import (
     assert_before_request_sent_event,
     PAGE_DATA_URL_HTML,
@@ -279,6 +280,42 @@ async def test_request_cookies(
     )
 
 
+@pytest.mark.asyncio
+async def test_request_timing_info(
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    current_time,
+):
+    network_events = await setup_network_test(events=[BEFORE_REQUEST_SENT_EVENT])
+    events = network_events[BEFORE_REQUEST_SENT_EVENT]
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    on_before_request_sent = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+    await fetch(url(PAGE_EMPTY_HTML), method="GET")
+    await wait_for_future_safe(on_before_request_sent)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
+    assert len(events) == 1
+
+    expected_request = {
+        "method": "GET",
+        "url": url(PAGE_EMPTY_HTML),
+    }
+    assert_before_request_sent_event(
+        events[0],
+        expected_request=expected_request,
+        expected_time_range=time_range,
+        redirect_count=0,
+    )
+
+
 @pytest.mark.asyncio
 async def test_redirect(bidi_session, wait_for_event, url, fetch, setup_network_test):
     text_url = url(PAGE_EMPTY_TEXT)
@@ -407,6 +444,7 @@ async def test_serviceworker_request(
     wait_for_future_safe,
     fetch,
     setup_network_test,
+    current_time,
 ):
     serviceworker_url = url(PAGE_SERVICEWORKER_HTML)
     await bidi_session.browsing_context.navigate(
@@ -426,23 +464,33 @@ async def test_serviceworker_request(
 
     on_before_request_sent = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
 
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     # Make a request to serviceworker_url via fetch on the page, but any url
     # would work here as this should be intercepted by the serviceworker.
     await fetch(serviceworker_url, context=new_tab, method="GET")
     await wait_for_future_safe(on_before_request_sent)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_before_request_sent_event(
         events[0],
-        expected_request={"method": "GET", "url": serviceworker_url},
+        expected_request={
+            "method": "GET",
+            "url": serviceworker_url,
+        },
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test
+    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -450,15 +498,26 @@ async def test_url_with_fragment(
     events = network_events[BEFORE_REQUEST_SENT_EVENT]
 
     on_before_request_sent = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     await fetch(fragment_url, method="GET")
     await wait_for_future_safe(on_before_request_sent)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     # Assert that the event contains the full fragment URL in requestData.
     assert_before_request_sent_event(
         events[0],
-        expected_request={"method": "GET", "url": fragment_url},
+        expected_request={
+            "method": "GET",
+            "url": fragment_url,
+        },
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
@@ -470,22 +529,39 @@ async def test_url_with_fragment(
 )
 @pytest.mark.asyncio
 async def test_navigate_data_url(
-    bidi_session, top_context, wait_for_event, wait_for_future_safe, setup_network_test, page_url
+    bidi_session,
+    top_context,
+    wait_for_event,
+    wait_for_future_safe,
+    setup_network_test,
+    page_url,
+    current_time,
 ):
     network_events = await setup_network_test(events=[BEFORE_REQUEST_SENT_EVENT])
     events = network_events[BEFORE_REQUEST_SENT_EVENT]
 
     on_before_request_sent = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     result = await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=page_url, wait="complete"
     )
     await wait_for_future_safe(on_before_request_sent)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_before_request_sent_event(
         events[0],
-        expected_request={"method": "GET", "url": page_url},
+        expected_request={
+            "method": "GET",
+            "url": page_url,
+        },
+        expected_time_range=time_range,
         redirect_count=0,
         navigation=result["navigation"],
     )
@@ -499,20 +575,36 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
-    wait_for_event, wait_for_future_safe, fetch, setup_network_test, fetch_url
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    fetch_url,
+    current_time,
 ):
     network_events = await setup_network_test(events=[BEFORE_REQUEST_SENT_EVENT])
     events = network_events[BEFORE_REQUEST_SENT_EVENT]
 
     on_before_request_sent = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     await fetch(fetch_url, method="GET")
     await wait_for_future_safe(on_before_request_sent)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_before_request_sent_event(
         events[0],
-        expected_request={"method": "GET", "url": fetch_url},
+        expected_request={
+            "method": "GET",
+            "url": fetch_url,
+        },
+        expected_time_range=time_range,
         redirect_count=0,
     )
     assert events[0]["navigation"] is None
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py b/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
index de6567100a9..aa2caa37702 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
@@ -6,6 +6,7 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
+from ... import number_interval
 from .. import (
     assert_fetch_error_event,
     assert_response_event,
@@ -215,6 +216,42 @@ async def test_request_method(
         )
 
 
+@pytest.mark.asyncio
+async def test_request_timing_info(
+    bidi_session,
+    new_tab,
+    wait_for_event,
+    wait_for_future_safe,
+    url,
+    fetch,
+    setup_network_test,
+    current_time,
+):
+    network_events = await setup_network_test(
+        events=[FETCH_ERROR_EVENT], context=new_tab["context"]
+    )
+    events = network_events[FETCH_ERROR_EVENT]
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    on_fetch_error = wait_for_event(FETCH_ERROR_EVENT)
+    asyncio.ensure_future(fetch(PAGE_INVALID_URL, context=new_tab))
+    await wait_for_future_safe(on_fetch_error)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
+    assert len(events) == 1
+    expected_request = {"method": "GET", "url": PAGE_INVALID_URL}
+    assert_fetch_error_event(
+        events[0],
+        expected_request=expected_request,
+        expected_time_range=time_range,
+        redirect_count=0,
+    )
+
+
 @pytest.mark.asyncio
 async def test_redirect_fetch(
     bidi_session, new_tab, wait_for_event, url, fetch, setup_network_test
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
index ba916390ea2..a6f8fb20aa1 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
@@ -7,6 +7,7 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
+from ... import number_interval
 from .. import (
     assert_response_event,
     HTTP_STATUS_AND_STATUS_TEXT,
@@ -162,6 +163,40 @@ async def test_load_page_twice(
     )
 
 
+@pytest.mark.asyncio
+async def test_request_timing_info(
+    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test,
+    current_time,
+):
+    network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
+    events = network_events[RESPONSE_COMPLETED_EVENT]
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
+    await fetch(url(PAGE_EMPTY_HTML), method="GET")
+    await wait_for_future_safe(on_response_completed)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
+    assert len(events) == 1
+
+    expected_request = {
+        "method": "GET",
+        "url": url(PAGE_EMPTY_HTML),
+    }
+    expected_response = {"url": url(PAGE_EMPTY_HTML)}
+    assert_response_event(
+        events[0],
+        expected_request=expected_request,
+        expected_response=expected_response,
+        expected_time_range=time_range,
+        redirect_count=0,
+    )
+
+
 @pytest.mark.parametrize(
     "status, status_text",
     HTTP_STATUS_AND_STATUS_TEXT,
@@ -384,6 +419,7 @@ async def test_serviceworker_request(
     wait_for_future_safe,
     fetch,
     setup_network_test,
+    current_time,
 ):
     serviceworker_url = url(PAGE_SERVICEWORKER_HTML)
     await bidi_session.browsing_context.navigate(
@@ -403,27 +439,37 @@ async def test_serviceworker_request(
 
     on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
 
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     # Make a request to serviceworker_url via fetch on the page, but any url
     # would work here as this should be intercepted by the serviceworker.
     await fetch(serviceworker_url, context=new_tab, method="GET")
     await wait_for_future_safe(on_response_completed)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": serviceworker_url},
+        expected_request={
+            "method": "GET",
+            "url": serviceworker_url,
+        },
         expected_response={
             "url": serviceworker_url,
             "statusText": "OK from serviceworker",
         },
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test
+    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -431,17 +477,28 @@ async def test_url_with_fragment(
     events = network_events[RESPONSE_COMPLETED_EVENT]
 
     on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     await fetch(fragment_url, method="GET")
     await wait_for_future_safe(on_response_completed)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     # Assert that the event contains the full fragment URL both in requestData
     # and responseData
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": fragment_url},
+        expected_request={
+            "method": "GET",
+            "url": fragment_url,
+        },
         expected_response={"url": fragment_url},
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
@@ -453,33 +510,50 @@ async def test_url_with_fragment(
 )
 @pytest.mark.asyncio
 async def test_navigate_data_url(
-    bidi_session, top_context, wait_for_event, wait_for_future_safe, setup_network_test, page_url, mimeType
+    bidi_session,
+    top_context,
+    wait_for_event,
+    wait_for_future_safe,
+    setup_network_test,
+    page_url,
+    mimeType,
+    current_time,
 ):
     network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
     events = network_events[RESPONSE_COMPLETED_EVENT]
 
     on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     result = await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=page_url, wait="complete"
     )
     await wait_for_future_safe(on_response_completed)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": page_url},
+        expected_request={
+            "method": "GET",
+            "url": page_url,
+        },
         expected_response={
-            "headers": [{
-                "name": "Content-Type",
-                "value": {"type": "string", "value": mimeType}
-            }],
+            "headers": [
+                {"name": "Content-Type", "value": {"type": "string", "value": mimeType}}
+            ],
             "mimeType": mimeType,
             "protocol": "data",
             "status": 200,
             "statusText": "OK",
             "url": page_url,
         },
+        expected_time_range=time_range,
         redirect_count=0,
         navigation=result["navigation"],
     )
@@ -493,31 +567,46 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
-    wait_for_event, wait_for_future_safe, fetch, setup_network_test, fetch_url, mimeType
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    fetch_url,
+    mimeType,
+    current_time,
 ):
     network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
     events = network_events[RESPONSE_COMPLETED_EVENT]
 
-    on_before_request_sent = wait_for_event(RESPONSE_COMPLETED_EVENT)
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
     await fetch(fetch_url, method="GET")
-    await wait_for_future_safe(on_before_request_sent)
+    await wait_for_future_safe(on_response_completed)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
 
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": fetch_url},
+        expected_request={
+            "method": "GET",
+            "url": fetch_url,
+        },
         expected_response={
-             "headers": [{
-                "name": "Content-Type",
-                "value": {"type": "string", "value": mimeType}
-            }],
+            "headers": [
+                {"name": "Content-Type", "value": {"type": "string", "value": mimeType}}
+            ],
             "mimeType": mimeType,
             "protocol": "data",
             "status": 200,
             "statusText": "OK",
             "url": fetch_url,
         },
+        expected_time_range=time_range,
         redirect_count=0,
     )
     assert events[0]["navigation"] is None
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
index d2d987d8e4a..310e91d57da 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
@@ -6,6 +6,7 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
+from ... import number_interval
 from .. import (
     assert_response_event,
     HTTP_STATUS_AND_STATUS_TEXT,
@@ -166,6 +167,44 @@ async def test_request_bodysize(
     assert events[0]["request"]["bodySize"] > 0
 
 
+@pytest.mark.asyncio
+async def test_request_timing_info(
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    current_time,
+):
+    network_events = await setup_network_test(events=[RESPONSE_STARTED_EVENT])
+    events = network_events[RESPONSE_STARTED_EVENT]
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
+    on_response_started = wait_for_event(RESPONSE_STARTED_EVENT)
+    await fetch(url(PAGE_EMPTY_HTML), method="GET")
+    await wait_for_future_safe(on_response_started)
+
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
+    assert len(events) == 1
+
+    expected_request = {
+        "method": "GET",
+        "url": url(PAGE_EMPTY_HTML),
+    }
+    expected_response = {"url": url(PAGE_EMPTY_HTML)}
+    assert_response_event(
+        events[0],
+        expected_request=expected_request,
+        expected_response=expected_response,
+        expected_time_range=time_range,
+        redirect_count=0,
+    )
+
+
 @pytest.mark.parametrize(
     "status, status_text",
     HTTP_STATUS_AND_STATUS_TEXT,
@@ -353,6 +392,7 @@ async def test_serviceworker_request(
     wait_for_future_safe,
     fetch,
     setup_network_test,
+    current_time,
 ):
     serviceworker_url = url(PAGE_SERVICEWORKER_HTML)
     await bidi_session.browsing_context.navigate(
@@ -372,27 +412,37 @@ async def test_serviceworker_request(
 
     on_response_started = wait_for_event(RESPONSE_STARTED_EVENT)
 
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     # Make a request to serviceworker_url via fetch on the page, but any url
     # would work here as this should be intercepted by the serviceworker.
     await fetch(serviceworker_url, context=new_tab, method="GET")
     await wait_for_future_safe(on_response_started)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": serviceworker_url},
+        expected_request={
+            "method": "GET",
+            "url": serviceworker_url,
+        },
         expected_response={
             "url": serviceworker_url,
             "statusText": "OK from serviceworker",
         },
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test
+    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -400,17 +450,28 @@ async def test_url_with_fragment(
     events = network_events[RESPONSE_STARTED_EVENT]
 
     on_response_started = wait_for_event(RESPONSE_STARTED_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     await fetch(fragment_url, method="GET")
     await wait_for_future_safe(on_response_started)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     # Assert that the event contains the full fragment URL both in requestData
     # and responseData
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": fragment_url},
+        expected_request={
+            "method": "GET",
+            "url": fragment_url,
+        },
         expected_response={"url": fragment_url},
+        expected_time_range=time_range,
         redirect_count=0,
     )
 
@@ -422,33 +483,50 @@ async def test_url_with_fragment(
 )
 @pytest.mark.asyncio
 async def test_navigate_data_url(
-    bidi_session, top_context, wait_for_event, wait_for_future_safe, setup_network_test, page_url, mimeType
+    bidi_session,
+    top_context,
+    wait_for_event,
+    wait_for_future_safe,
+    setup_network_test,
+    page_url,
+    mimeType,
+    current_time,
 ):
     network_events = await setup_network_test(events=[RESPONSE_STARTED_EVENT])
     events = network_events[RESPONSE_STARTED_EVENT]
 
     on_response_started = wait_for_event(RESPONSE_STARTED_EVENT)
+
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     result = await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=page_url, wait="complete"
     )
     await wait_for_future_safe(on_response_started)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": page_url},
+        expected_request={
+            "method": "GET",
+            "url": page_url,
+        },
         expected_response={
-            "headers": [{
-                "name": "Content-Type",
-                "value": {"type": "string", "value": mimeType}
-            }],
+            "headers": [
+                {"name": "Content-Type", "value": {"type": "string", "value": mimeType}}
+            ],
             "mimeType": mimeType,
             "protocol": "data",
             "status": 200,
             "statusText": "OK",
             "url": page_url,
         },
+        expected_time_range=time_range,
         redirect_count=0,
         navigation=result["navigation"],
     )
@@ -462,31 +540,46 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
-    wait_for_event, wait_for_future_safe, fetch, setup_network_test, fetch_url, mimeType
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    fetch_url,
+    mimeType,
+    current_time,
 ):
     network_events = await setup_network_test(events=[RESPONSE_STARTED_EVENT])
     events = network_events[RESPONSE_STARTED_EVENT]
 
+    # Record the time range for the request to assert the timing info.
+    time_start = await current_time()
+
     on_response_started = wait_for_event(RESPONSE_STARTED_EVENT)
     await fetch(fetch_url, method="GET")
     await wait_for_future_safe(on_response_started)
 
+    time_end = await current_time()
+    time_range = number_interval(time_start, time_end)
+
     assert len(events) == 1
 
     assert_response_event(
         events[0],
-        expected_request={"method": "GET", "url": fetch_url},
+        expected_request={
+            "method": "GET",
+            "url": fetch_url,
+        },
         expected_response={
-            "headers": [{
-                "name": "Content-Type",
-                "value": {"type": "string", "value": mimeType}
-            }],
+            "headers": [
+                {"name": "Content-Type", "value": {"type": "string", "value": mimeType}}
+            ],
             "mimeType": mimeType,
             "protocol": "data",
             "status": 200,
             "statusText": "OK",
             "url": fetch_url,
         },
+        expected_time_range=time_range,
         redirect_count=0,
     )
     assert events[0]["navigation"] is None
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 f8683ce4515..9686cd0a1e8 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
@@ -8,7 +8,7 @@ from tests.classic.perform_actions.support.mouse import (
 )
 from tests.classic.perform_actions.support.refine import get_events
 from tests.support.asserts import assert_move_to_coordinates
-from tests.support.helpers import filter_dict
+from tests.support.helpers import center_point, filter_dict
 from tests.support.sync import Poll
 
 from . import assert_pointer_events, record_pointer_events
@@ -204,6 +204,53 @@ def test_move_to_position_in_viewport(
     assert len(events) == event_count
 
 
+@pytest.mark.parametrize("origin", ["viewport", "pointer", "element"])
+def test_move_to_origin_position_within_frame(
+    session, iframe, inline, mouse_chain, origin
+):
+    session.url = inline(
+        iframe(
+            """
+        <input>
+        <script>
+            "use strict;"
+
+            var allEvents = { events: [] };
+            window.addEventListener("mousemove", e => {
+                allEvents.events.push([
+                    e.clientX,
+                    e.clientY,
+                ]);
+            });
+        </script>
+    """
+        )
+    )
+
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+
+    elem = session.find.css("input", all=False)
+    elem_center_point = center_point(elem)
+
+    offset = [10, 5]
+
+    if origin == "element":
+        origin = elem
+        target_point = [
+            elem_center_point[0] + offset[0],
+            elem_center_point[1] + offset[1],
+        ]
+    else:
+        target_point = offset
+
+    mouse_chain.pointer_move(offset[0], offset[1], origin=origin).perform()
+
+    events = get_events(session)
+    assert len(events) == 1
+    assert events[0] == target_point
+
+
 @pytest.mark.parametrize("drag_duration", [0, 300, 800])
 @pytest.mark.parametrize("dx, dy", [
     (20, 0), (0, 15), (10, 15), (-20, 0), (10, -15), (-10, -15)
diff --git a/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html
new file mode 100644
index 00000000000..0a286acd3be
--- /dev/null
+++ b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<body>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/permissions-policy/resources/permissions-policy.js></script>
+<script>
+'use strict';
+const relative_path = '/permissions-policy/resources/permissions-policy-hid.html';
+const base_src = '/permissions-policy/resources/redirect-on-load.html#';
+const relative_worker_frame_path =
+    '/permissions-policy/resources/permissions-policy-hid-worker.html';
+const sub = 'https://{{domains[www]}}:{{ports[https][0]}}';
+const same_origin_src = base_src + relative_path;
+const cross_origin_src = base_src + sub + relative_path;
+const same_origin_worker_frame_src = base_src + relative_worker_frame_path;
+const cross_origin_worker_frame_src = base_src + sub +
+    relative_worker_frame_path;
+const header = 'Permissions-Policy allow="hid"';
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, same_origin_src,
+      expect_feature_available_default, 'hid');
+}, header + ' allows same-origin relocation.');
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, same_origin_worker_frame_src,
+      expect_feature_available_default, 'hid');
+}, header + ' allows workers in same-origin relocation.');
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, cross_origin_src,
+      expect_feature_unavailable_default, 'hid');
+}, header + ' disallows cross-origin relocation.');
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, cross_origin_worker_frame_src,
+      expect_feature_unavailable_default, 'hid');
+}, header + ' disallows workers in cross-origin relocation.');
+</script>
+</body>
diff --git a/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute.https.sub.html
new file mode 100644
index 00000000000..f0963c4e401
--- /dev/null
+++ b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy-attribute.https.sub.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<body>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/permissions-policy/resources/permissions-policy.js></script>
+<script>
+'use strict';
+const sub = 'https://{{domains[www]}}:{{ports[https][0]}}';
+const same_origin_src = '/permissions-policy/resources/permissions-policy-hid.html';
+const cross_origin_src = sub + same_origin_src;
+const same_origin_worker_frame_src =
+    '/permissions-policy/resources/permissions-policy-hid-worker.html';
+const cross_origin_worker_frame_src = sub + same_origin_worker_frame_src;
+const feature_name = 'Permissions policy "hid"';
+const header = 'allow="hid" attribute';
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, same_origin_src,
+      expect_feature_available_default, 'hid');
+}, feature_name + ' can be enabled in same-origin iframe using ' + header);
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, same_origin_worker_frame_src,
+      expect_feature_available_default, 'hid');
+}, feature_name + ' can be enabled in a worker in same-origin iframe using ' +
+    header);
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, cross_origin_src,
+      expect_feature_available_default, 'hid');
+}, feature_name + ' can be enabled in cross-origin iframe using ' + header);
+
+async_test(t => {
+  test_feature_availability(
+      'hid.getDevices()', t, cross_origin_worker_frame_src,
+      expect_feature_available_default, 'hid');
+}, feature_name + ' can be enabled in a worker in cross-origin iframe using ' +
+    header);
+
+fetch_tests_from_worker(new Worker(
+    '/webhid/resources/hid-allowed-by-permissions-policy-worker.js'));
+</script>
+</body>
diff --git a/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html
new file mode 100644
index 00000000000..645989c3f22
--- /dev/null
+++ b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<body>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/permissions-policy/resources/permissions-policy.js></script>
+<script>
+'use strict';
+const sub = 'https://{{domains[www]}}:{{ports[https][0]}}';
+const same_origin_src = '/permissions-policy/resources/permissions-policy-hid.html';
+const cross_origin_src = sub + same_origin_src;
+const same_origin_worker_frame_src =
+    '/permissions-policy/resources/permissions-policy-hid-worker.html';
+const cross_origin_worker_frame_src = sub + same_origin_worker_frame_src;
+const header = 'Permissions-Policy header hid=*';
+
+promise_test(
+    () => navigator.hid.getDevices(),
+    header + ' allows the top-level document.');
+
+async_test(t => {
+  test_feature_availability('hid.getDevices()', t, same_origin_src,
+      expect_feature_available_default);
+}, header + ' allows same-origin iframes.');
+
+async_test(t => {
+  test_feature_availability('hid.getDevices()', t, same_origin_worker_frame_src,
+      expect_feature_available_default);
+}, header + ' allows workers in same-origin iframes.');
+
+// Set allow="hid" on iframe element to delegate 'hid' to cross origin subframe.
+async_test(t => {
+  test_feature_availability('hid.getDevices()', t, cross_origin_src,
+      expect_feature_available_default, 'hid');
+}, header + ' allows cross-origin iframes.');
+
+// Set allow="hid" on iframe element to delegate 'hid' to cross origin subframe.
+async_test(t => {
+  test_feature_availability('hid.getDevices()', t,
+      cross_origin_worker_frame_src,
+      expect_feature_available_default, 'hid');
+}, header + ' allows workers in cross-origin iframes.');
+
+fetch_tests_from_worker(new Worker(
+    '/webhid/resources/hid-allowed-by-permissions-policy-worker.js'));
+</script>
+</body>
diff --git a/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html.headers
new file mode 100644
index 00000000000..e3650072dd2
--- /dev/null
+++ b/tests/wpt/tests/webhid/hid-allowed-by-permissions-policy.https.sub.html.headers
@@ -0,0 +1 @@
+Permissions-Policy: hid=*
diff --git a/tests/wpt/tests/webhid/idlharness.https.window.js b/tests/wpt/tests/webhid/idlharness.https.any.js
similarity index 63%
rename from tests/wpt/tests/webhid/idlharness.https.window.js
rename to tests/wpt/tests/webhid/idlharness.https.any.js
index bdc8419ba8b..c0ed0663665 100644
--- a/tests/wpt/tests/webhid/idlharness.https.window.js
+++ b/tests/wpt/tests/webhid/idlharness.https.any.js
@@ -9,9 +9,14 @@ idl_test(
   ['webhid'],
   ['html', 'dom'],
   idl_array => {
+    if (self.GLOBAL.isWindow()) {
+      idl_array.add_objects({ Navigator: ['navigator'] });
+    } else if (self.GLOBAL.isWorker()) {
+      idl_array.add_objects({ WorkerNavigator: ['navigator'] });
+    }
+
     idl_array.add_objects({
       HID: ['navigator.hid'],
-      Navigator: ['navigator'],
       // TODO: HIDConnectionEvent
       // TODO: HIDInputReportEvent
       // TODO: HIDDevice
diff --git a/tests/wpt/tests/webhid/resources/hid-allowed-by-permissions-policy-worker.js b/tests/wpt/tests/webhid/resources/hid-allowed-by-permissions-policy-worker.js
new file mode 100644
index 00000000000..20cdb5d85a8
--- /dev/null
+++ b/tests/wpt/tests/webhid/resources/hid-allowed-by-permissions-policy-worker.js
@@ -0,0 +1,14 @@
+'use strict';
+
+importScripts('/resources/testharness.js');
+
+let workerType;
+
+if (typeof postMessage === 'function') {
+  workerType = 'dedicated';
+}
+
+promise_test(() => navigator.hid.getDevices(),
+    `Inherited header permissions policy allows ${workerType} workers.`);
+
+done();
diff --git a/tests/wpt/tests/webhid/resources/hid-disabled-by-permissions-policy-worker.js b/tests/wpt/tests/webhid/resources/hid-disabled-by-permissions-policy-worker.js
new file mode 100644
index 00000000000..108a09d538b
--- /dev/null
+++ b/tests/wpt/tests/webhid/resources/hid-disabled-by-permissions-policy-worker.js
@@ -0,0 +1,17 @@
+'use strict';
+
+importScripts('/resources/testharness.js');
+
+const header = 'Permissions-Policy header hid=()';
+let workerType;
+
+if (typeof postMessage === 'function') {
+  workerType = 'dedicated';
+}
+
+promise_test(() => navigator.hid.getDevices().then(
+        () => assert_unreached('expected promise to reject with SecurityError'),
+        error => assert_equals(error.name, 'SecurityError')),
+    `Inherited ${header} disallows ${workerType} workers.`);
+
+done();
diff --git a/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js b/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
index ca9f3d3ca94..0f8a6cd3309 100644
--- a/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
@@ -29,7 +29,7 @@ const absTests = [
       'inputs': {
         'absInput': {
           'data': [49.837242126464844],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -40,7 +40,7 @@ const absTests = [
       'expectedOutputs': {
         'absOutput': {
           'data': [49.837242126464844],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -51,7 +51,7 @@ const absTests = [
       'inputs': {
         'absInput': {
           'data': [-91.03521728515625],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -62,7 +62,7 @@ const absTests = [
       'expectedOutputs': {
         'absOutput': {
           'data': [91.03521728515625],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -82,7 +82,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -103,7 +103,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -143,7 +143,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -163,7 +163,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -183,7 +183,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -203,7 +203,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -223,7 +223,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -243,7 +243,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -263,7 +263,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -283,7 +283,7 @@ const absTests = [
             30.097660064697266,  -74.21503448486328, 95.60974884033203,
             6.614287376403809,   31.2832088470459,   -53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -303,7 +303,7 @@ const absTests = [
             30.097660064697266, 74.21503448486328, 95.60974884033203,
             6.614287376403809,  31.2832088470459,  53.206058502197266
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/add.https.any.js b/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
index 17c04d1d2c1..c084dd009e2 100644
--- a/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
@@ -36,7 +36,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const addTests = [
             89.3588638305664,    28.6798095703125,   -29.72130584716797,
             -90.6352310180664,   28.2818546295166,   27.662540435791016
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const addTests = [
             117.07791900634766,  10.460599899291992,  22.931793212890625,
             -160.62979125976562, 68.10350799560547,   -2.3239879608154297
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const addTests = [
       'inputs': {
         'inputA': {
           'data': [-59.361572265625],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const addTests = [
             -31.642518997192383, -77.58078002929688,  -6.708473205566406,
             -129.3561248779297,  -19.5399169921875,   -89.34809875488281
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -17.981124877929688, -70.45854187011719, -12.762019157409668,
             24.254032135009766, -68.12599182128906, 30.62627410888672
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -427,7 +427,7 @@ const addTests = [
             9.73792839050293,   -88.67774963378906,  39.89107894897461,
             -45.74052047729492, -28.304336547851562, 0.6397457122802734
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -447,14 +447,14 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -32.34067153930664, 43.12499237060547, 78.6887435913086,
             -54.49899673461914
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const addTests = [
             106.40779876708984,  60.46953582763672,   131.3418426513672,
             -124.49354553222656, -14.67734146118164,  -84.48552703857422
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -485,7 +485,7 @@ const addTests = [
       'inputs': {
         'inputA': {
           'data': [-59.361572265625],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -498,7 +498,7 @@ const addTests = [
             27.719053268432617,  -18.219209671020508, 52.653099060058594,
             -69.99455261230469,  39.8216552734375,    -29.986528396606445
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -518,7 +518,7 @@ const addTests = [
             -31.642518997192383, -77.58078002929688,  -6.708473205566406,
             -129.3561248779297,  -19.5399169921875,   -89.34809875488281
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -529,12 +529,12 @@ const addTests = [
       'inputs': {
         'inputA': {
           'data': 89.32998657226562,
-          'descriptor': {'dimensions': [6000, 6000], 'dataType': 'float32'},
+          'descriptor': {shape: [6000, 6000], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
           'data': 77.24720764160156,
-          'descriptor': {'dimensions': [6000, 6000], 'dataType': 'float32'}
+          'descriptor': {shape: [6000, 6000], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -545,7 +545,7 @@ const addTests = [
       'expectedOutputs': {
         'output': {
           'data': 166.5771942138672,
-          'descriptor': {'dimensions': [6000, 6000], 'dataType': 'float32'}
+          'descriptor': {shape: [6000, 6000], dataType: 'float32'}
         }
       }
     }
@@ -556,12 +556,12 @@ const addTests = [
       'inputs': {
         '12-L#!.☺': {
           'data': [89.32998657226562],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         },
         '🤦🏼‍♂️124DS#!F': {
           'data': [77.24720764160156],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -572,7 +572,7 @@ const addTests = [
       'expectedOutputs': {
         'output': {
           'data': [166.5771942138672],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
index e730f5135e8..a3711d3ab81 100644
--- a/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
@@ -46,7 +46,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -57,7 +57,7 @@ const argMinMaxTests = [
       }],
       'expectedOutputs': {
         'argminOutput':
-            {'data': [7], 'descriptor': {'dimensions': [], 'dataType': 'int32'}}
+            {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
   },
@@ -76,7 +76,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -86,7 +86,7 @@ const argMinMaxTests = [
       }],
       'expectedOutputs': {
         'argminOutput':
-            {'data': [7], 'descriptor': {'dimensions': [], 'dataType': 'int32'}}
+            {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
   },
@@ -105,7 +105,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -116,7 +116,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 2, 0, 1, 1],
-          'descriptor': {'dimensions': [6], 'dataType': 'int32'}
+          'descriptor': {shape: [6], dataType: 'int32'}
         }
       }
     }
@@ -136,7 +136,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -147,7 +147,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'int32'}
+          'descriptor': {shape: [3, 4], dataType: 'int32'}
         }
       }
     }
@@ -167,7 +167,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -178,7 +178,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 4, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
       }
     }
@@ -198,7 +198,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -209,7 +209,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 4, 1, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
         }
       }
     }
@@ -229,7 +229,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [2, 2, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 1, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -274,7 +274,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 1, 4, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 1, 4, 3], dataType: 'int32'}
         }
       }
     }
@@ -294,7 +294,7 @@ const argMinMaxTests = [
             -82.78385925292969, -96.50904083251953,  39.76872634887695,
             42.1504020690918,   82.66864013671875,   85.45269012451172
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -308,7 +308,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argminOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 4, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
       }
     }
@@ -330,7 +330,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -341,7 +341,7 @@ const argMinMaxTests = [
       }],
       'expectedOutputs': {
         'argmaxOutput':
-            {'data': [3], 'descriptor': {'dimensions': [], 'dataType': 'int32'}}
+            {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
   },
@@ -360,7 +360,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -370,7 +370,7 @@ const argMinMaxTests = [
       }],
       'expectedOutputs': {
         'argmaxOutput':
-            {'data': [3], 'descriptor': {'dimensions': [], 'dataType': 'int32'}}
+            {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
   },
@@ -389,7 +389,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -400,7 +400,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [1, 1, 1, 0, 0, 0],
-          'descriptor': {'dimensions': [6], 'dataType': 'int32'}
+          'descriptor': {shape: [6], dataType: 'int32'}
         }
       }
     }
@@ -420,7 +420,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -431,7 +431,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'int32'}
+          'descriptor': {shape: [3, 4], dataType: 'int32'}
         }
       }
     }
@@ -451,7 +451,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -462,7 +462,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 4, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
       }
     }
@@ -482,7 +482,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -493,7 +493,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 4, 1, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
         }
       }
     }
@@ -513,7 +513,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -524,7 +524,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [1, 2, 2, 1, 2, 2],
-          'descriptor': {'dimensions': [2, 1, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
         }
       }
     }
@@ -544,7 +544,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -558,7 +558,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [2, 0, 2, 1, 2, 0, 2, 1],
-          'descriptor': {'dimensions': [2, 1, 4, 1], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 1, 4, 1], dataType: 'int32'}
         }
       }
     }
@@ -578,7 +578,7 @@ const argMinMaxTests = [
             -41.70176696777344, 73.8133773803711,   88.46114349365234,
             -84.94000244140625, -61.48894119262695, -98.3387451171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -592,7 +592,7 @@ const argMinMaxTests = [
       'expectedOutputs': {
         'argmaxOutput': {
           'data': [2, 0, 2, 1, 2, 0, 2, 1],
-          'descriptor': {'dimensions': [2, 1, 4], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 1, 4], dataType: 'int32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
index 08dda14db28..55c8ddbe761 100644
--- a/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
@@ -22,14 +22,6 @@
 //     MLOperand input, MLOperand mean, MLOperand, variance,
 //     optional MLBatchNormalizationOptions options = {});
 
-
-const getBatchNormPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 6, float16: 6};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const batchNormTests = [
   {
     'name':
@@ -47,21 +39,21 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'bnMean': {
           'data': [
             -7.814267635345459, -95.64129638671875, 38.15440368652344,
             -55.95203399658203, -87.86500549316406, -41.63645553588867
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         },
         'bnVariance': {
           'data': [
             60.31186294555664, 26.43260383605957, 53.275634765625,
             40.146121978759766, 59.41098403930664, 35.99981689453125
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -83,7 +75,7 @@ const batchNormTests = [
             -0.1989477425813675, 34.203548431396484, -16.923160552978516,
             18.671411514282227,  2.5159497261047363, 4.921559810638428
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -103,7 +95,7 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 6], dataType: 'float32'},
           'constant': true
         },
         'bnMean': {
@@ -111,7 +103,7 @@ const batchNormTests = [
             -7.814267635345459, -95.64129638671875, 38.15440368652344,
             -55.95203399658203, -87.86500549316406, -41.63645553588867
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'},
+          'descriptor': {shape: [6], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
@@ -119,7 +111,7 @@ const batchNormTests = [
             60.31186294555664, 26.43260383605957, 53.275634765625,
             40.146121978759766, 59.41098403930664, 35.99981689453125
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'},
+          'descriptor': {shape: [6], dataType: 'float32'},
           'constant': true
         }
       },
@@ -142,7 +134,7 @@ const batchNormTests = [
             -0.1989477425813675, 34.203548431396484, -16.923160552978516,
             18.671411514282227,  2.5159497261047363, 4.921559810638428
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -162,14 +154,14 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'bnMean': {
           'data': [
             -7.814267635345459, -95.64129638671875, 38.15440368652344,
             -55.95203399658203, -87.86500549316406, -41.63645553588867
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'},
+          'descriptor': {shape: [6], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
@@ -177,7 +169,7 @@ const batchNormTests = [
             60.31186294555664, 26.43260383605957, 53.275634765625,
             40.146121978759766, 59.41098403930664, 35.99981689453125
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'},
+          'descriptor': {shape: [6], dataType: 'float32'},
           'constant': true
         }
       },
@@ -200,7 +192,7 @@ const batchNormTests = [
             -0.1989477425813675, 34.203548431396484, -16.923160552978516,
             18.671411514282227,  2.5159497261047363, 4.921559810638428
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -220,16 +212,16 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'bnMean': {
           'data': [12.810380935668945, 63.13715362548828, -61.62983322143555],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [18.358240127563477, 41.847232818603516, 16.12828254699707],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -252,7 +244,7 @@ const batchNormTests = [
             -11.206846237182617, 2.638929843902588,   -5.910898208618164,
             30.871898651123047,  -1.7038332223892212, 12.331327438354492
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -272,16 +264,16 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -304,7 +296,7 @@ const batchNormTests = [
             -11.698976516723633, -2.0609331130981445, 1.2540507316589355,
             18.43954849243164,   3.2196571826934814,  9.777103424072266
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -324,16 +316,16 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [6, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [35.4078254699707],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [40.93109893798828],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -356,7 +348,7 @@ const batchNormTests = [
             -6.99733304977417,   7.002535343170166,   -18.877885818481445,
             4.211489677429199,   -16.237018585205078, -7.42683744430542
           ],
-          'descriptor': {'dimensions': [6, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -376,16 +368,16 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -409,7 +401,7 @@ const batchNormTests = [
             -11.698976516723633, -2.0609331130981445, 1.2540507316589355,
             18.43954849243164,   3.2196571826934814,  9.777103424072266
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -429,16 +421,16 @@ const batchNormTests = [
             76.8831787109375,    -9.359310150146484,   -68.4724349975586,
             97.03362274169922,   80.20824432373047,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -462,7 +454,7 @@ const batchNormTests = [
             4.576685905456543,   -11.698976516723633, 3.2196571826934814,
             8.228469848632812,   -2.0609331130981445, 9.777103424072266
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -482,21 +474,21 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnScale': {
           'data': [65.50171661376953, -71.007568359375, -5.569730758666992],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -520,7 +512,7 @@ const batchNormTests = [
             830.7158813476562,   146.3418426513672,   -6.984724998474121,
             -102.70331573486328, -17.9326229095459,   -54.455833435058594
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -540,21 +532,21 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnBias': {
           'data': [64.2044677734375, 75.28591918945312, -84.57243347167969],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -578,7 +570,7 @@ const batchNormTests = [
             63.586944580078125, 73.22498321533203,  -83.3183822631836,
             -66.13288879394531, -81.35277557373047, -74.79533386230469
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -598,16 +590,16 @@ const batchNormTests = [
             -9.359310150146484,  80.20824432373047,    -85.36802673339844,
             62.35185241699219,   -68.4724349975586,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -631,7 +623,7 @@ const batchNormTests = [
             -11.698976516723633, -2.0609331130981445, 1.254050850868225,
             18.43954849243164,   3.2196574211120605,  9.777103424072266
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -651,26 +643,26 @@ const batchNormTests = [
             76.8831787109375,    -9.359310150146484,   -68.4724349975586,
             97.03362274169922,   80.20824432373047,    -12.10716724395752
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'bnMean': {
           'data': [51.629150390625, 99.36075592041016, -96.1473617553711],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnVariance': {
           'data': [30.448015213012695, 86.36219024658203, 73.88455200195312],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnScale': {
           'data': [65.50171661376953, -71.007568359375, -5.569730758666992],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'bnBias': {
           'data': [64.2044677734375, 75.28591918945312, -84.57243347167969],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -701,7 +693,7 @@ const batchNormTests = [
             363.98524710447384,  906.0018322105,     -102.5050592863526,
             603.1834043179756,   221.6277675074517,  -139.02827100419768
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -710,8 +702,7 @@ const batchNormTests = [
 
 if (navigator.ml) {
   batchNormTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getBatchNormPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/byob_readtensor.https.any.js b/tests/wpt/tests/webnn/conformance_tests/byob_readtensor.https.any.js
index 9a12bf02439..b99c8704d23 100644
--- a/tests/wpt/tests/webnn/conformance_tests/byob_readtensor.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/byob_readtensor.https.any.js
@@ -31,7 +31,7 @@ promise_setup(async () => {
   try {
     mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [2, 4],
+      shape: [2, 4],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
   } catch (e) {
@@ -140,7 +140,7 @@ promise_test(async () => {
 promise_test(async (t) => {
   const tensor = await mlContext.createTensor({
     dataType: 'int32',
-    dimensions: [2, 2],
+    shape: [2, 2],
     usage: MLTensorUsage.READ,
   });
   const arrayBufferView = new Int32Array(2 * 2);
@@ -158,7 +158,7 @@ promise_test(async (t) => {
 promise_test(async (t) => {
   const tensor = await mlContext.createTensor({
     dataType: 'int32',
-    dimensions: [2, 2],
+    shape: [2, 2],
     usage: MLTensorUsage.READ,
   });
   const arrayBufferView = new Int32Array(2 * 2);
diff --git a/tests/wpt/tests/webnn/conformance_tests/cast.https.any.js b/tests/wpt/tests/webnn/conformance_tests/cast.https.any.js
index a4223736f61..b73cf3c41bb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/cast.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/cast.https.any.js
@@ -35,7 +35,7 @@ const castTests = [
       'inputs': {
         'castInput': {
           'data': [84.77753448486328],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -44,10 +44,8 @@ const castTests = [
         'outputs': 'castOutput'
       }],
       'expectedOutputs': {
-        'castOutput': {
-          'data': [84],
-          'descriptor': {'dimensions': [], 'dataType': 'int32'}
-        }
+        'castOutput':
+            {'data': [84], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
   },
@@ -70,7 +68,7 @@ const castTests = [
             -27.49382972717285,  -23.836687088012695,
             70.77123260498047,   83.5
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -84,7 +82,7 @@ const castTests = [
             102, -43, 52, -99, 6,  92, -10, 106, -7,  91,  -50, 83,
             72,  -31, 79, 41,  35, -2, -96, -86, -27, -23, 70,  83
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'int32'}
+          'descriptor': {shape: [24], dataType: 'int32'}
         }
       }
     }
@@ -108,7 +106,7 @@ const castTests = [
             -27.49382972717285,  -23.836687088012695,
             70.77123260498047,   83.5
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -122,7 +120,7 @@ const castTests = [
             102, -43, 52, -99, 6,  92, -10, 106, -7,  91,  -50, 83,
             72,  -31, 79, 41,  35, -2, -96, -86, -27, -23, 70,  83
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'int32'}
+          'descriptor': {shape: [4, 6], dataType: 'int32'}
         }
       }
     }
@@ -146,7 +144,7 @@ const castTests = [
             -27.49382972717285,  -23.836687088012695,
             70.77123260498047,   83.5
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +158,7 @@ const castTests = [
             102, -43, 52, -99, 6,  92, -10, 106, -7,  91,  -50, 83,
             72,  -31, 79, 41,  35, -2, -96, -86, -27, -23, 70,  83
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'int32'}
         }
       }
     }
@@ -184,7 +182,7 @@ const castTests = [
             -27.49382972717285,  -23.836687088012695,
             70.77123260498047,   83.5
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -198,7 +196,7 @@ const castTests = [
             102, -43, 52, -99, 6,  92, -10, 106, -7,  91,  -50, 83,
             72,  -31, 79, 41,  35, -2, -96, -86, -27, -23, 70,  83
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -222,7 +220,7 @@ const castTests = [
             -27.49382972717285,  -23.836687088012695,
             70.77123260498047,   83.5
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -236,7 +234,7 @@ const castTests = [
             102, -43, 52, -99, 6,  92, -10, 106, -7,  91,  -50, 83,
             72,  -31, 79, 41,  35, -2, -96, -86, -27, -23, 70,  83
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'int32'}
         }
       }
     }
@@ -256,7 +254,7 @@ const castTests = [
             96.05252838134766,  86.76212310791016,  27.49382972717285,
             23.836687088012695, 70.77123260498047,  83.8347396850586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -272,7 +270,7 @@ const castTests = [
             73,       31.015625, 79.9375,  41.84375, 35.71875,   2.61328125,
             96.0625,  86.75,     27.5,     23.84375, 70.75,      83.8125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -292,7 +290,7 @@ const castTests = [
             96.05252838134766,  86.76212310791016,  27.49382972717285,
             23.836687088012695, 70.77123260498047,  83.8347396850586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -306,7 +304,7 @@ const castTests = [
             102, 43, 52, 99, 6,  92, 10, 106, 7,  91, 50, 83,
             72,  31, 79, 41, 35, 2,  96, 86,  27, 23, 70, 83
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       }
     }
@@ -326,7 +324,7 @@ const castTests = [
             96.05252838134766,  86.76212310791016,  27.49382972717285,
             23.836687088012695, 70.77123260498047,  83.8347396850586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -341,7 +339,7 @@ const castTests = [
             '7',   '91', '50', '83', '72', '31', '79', '41',
             '35',  '2',  '96', '86', '27', '23', '70', '83'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -361,7 +359,7 @@ const castTests = [
             96.05252838134766,  86.76212310791016,  27.49382972717285,
             23.836687088012695, 70.77123260498047,  83.8347396850586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -375,7 +373,7 @@ const castTests = [
             102, 43, 52, 99, 6,  92, 10, 106, 7,  91, 50, 83,
             72,  31, 79, 41, 35, 2,  96, 86,  27, 23, 70, 83
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
@@ -395,7 +393,7 @@ const castTests = [
             96.05252838134766,  86.76212310791016,  27.49382972717285,
             23.836687088012695, 70.77123260498047,  83.8347396850586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -409,7 +407,7 @@ const castTests = [
             102, 43, 52, 99, 6,  92, 10, 106, 7,  91, 50, 83,
             72,  31, 79, 41, 35, 2,  96, 86,  27, 23, 70, 83
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -425,7 +423,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -441,7 +439,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -457,7 +455,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -471,7 +469,7 @@ const castTests = [
             3,  32, 62,  51, 87, 106, 125, 112, 70, 39, 10,  21,
             99, 16, 115, 66, 49, 115, 77,  57,  61, 12, 101, 123
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -487,7 +485,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -501,7 +499,7 @@ const castTests = [
             3,  32, 62,  51, 87, 106, 125, 112, 70, 39, 10,  21,
             99, 16, 115, 66, 49, 115, 77,  57,  61, 12, 101, 123
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       }
     }
@@ -517,7 +515,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -532,7 +530,7 @@ const castTests = [
             '70', '39',  '10', '21', '99', '16',  '115', '66',
             '49', '115', '77', '57', '61', '12',  '101', '123'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -548,7 +546,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -562,7 +560,7 @@ const castTests = [
             3,  32, 62,  51, 87, 106, 125, 112, 70, 39, 10,  21,
             99, 16, 115, 66, 49, 115, 77,  57,  61, 12, 101, 123
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
@@ -578,7 +576,7 @@ const castTests = [
             99.75,       16.125,   115.625,  66,         49.375,     115.75,
             77,          57.15625, 61.6875,  12.9296875, 101.25,     123.9375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -592,7 +590,7 @@ const castTests = [
             3,  32, 62,  51, 87, 106, 125, 112, 70, 39, 10,  21,
             99, 16, 115, 66, 49, 115, 77,  57,  61, 12, 101, 123
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -606,7 +604,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -620,7 +618,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -634,7 +632,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -648,7 +646,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -662,7 +660,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -677,7 +675,7 @@ const castTests = [
             '41', '110', '92',  '69', '48', '23',  '58',  '12',
             '33', '24',  '101', '87', '49', '118', '1',   '77'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -691,7 +689,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -705,7 +703,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
@@ -719,7 +717,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -733,7 +731,7 @@ const castTests = [
             45, 55, 11, 21, 78, 104, 102, 66, 41, 110, 92, 69,
             48, 23, 58, 12, 33, 24,  101, 87, 49, 118, 1,  77
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -747,7 +745,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -761,7 +759,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -775,7 +773,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -789,7 +787,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -803,7 +801,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -817,7 +815,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -831,7 +829,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -846,7 +844,7 @@ const castTests = [
             '104', '42',  '6',   '91', '93',  '21', '40', '21',
             '51',  '110', '115', '12', '122', '68', '57', '72'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -860,7 +858,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -874,7 +872,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
@@ -888,7 +886,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       },
       'operators': [{
@@ -902,7 +900,7 @@ const castTests = [
             34, 83, 113, 31, 62, 80,  8,   40, 104, 42, 6,  91,
             93, 21, 40,  21, 51, 110, 115, 12, 122, 68, 57, 72
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -916,7 +914,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -930,7 +928,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -944,7 +942,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -958,7 +956,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -972,7 +970,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -986,7 +984,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -1000,7 +998,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -1014,7 +1012,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       }
     }
@@ -1028,7 +1026,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -1042,7 +1040,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
@@ -1056,7 +1054,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -1070,7 +1068,7 @@ const castTests = [
             50, 1,  28, 20, 102, 86,  70, 38, 50,  19, 11, 4,
             56, 77, 40, 80, 45,  127, 4,  87, 125, 26, 63, 11
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -1084,7 +1082,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1098,7 +1096,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -1112,7 +1110,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1126,7 +1124,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -1140,7 +1138,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1154,7 +1152,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -1168,7 +1166,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1182,7 +1180,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       }
     }
@@ -1196,7 +1194,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1211,7 +1209,7 @@ const castTests = [
             '14',  '64', '109', '4',  '2',  '0',  '45', '47',
             '72',  '88', '82',  '4',  '73', '36', '65', '117'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -1225,7 +1223,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -1239,7 +1237,7 @@ const castTests = [
             123, 17, 31, 77, 88, 44, 84, 40, 14, 64, 109, 4,
             2,   0,  45, 47, 72, 88, 82, 4,  73, 36, 65,  117
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -1253,7 +1251,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1267,7 +1265,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -1281,7 +1279,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1295,7 +1293,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -1309,7 +1307,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1323,7 +1321,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
         }
       }
     }
@@ -1337,7 +1335,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1351,7 +1349,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint32'}
         }
       }
     }
@@ -1365,7 +1363,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1380,7 +1378,7 @@ const castTests = [
             '75', '121', '55',  '47',  '121', '24',  '16', '33',
             '97', '24',  '3',   '37',  '45',  '6',   '56', '57'
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
         }
       }
     }
@@ -1394,7 +1392,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -1408,7 +1406,7 @@ const castTests = [
             10,  112, 121, 120, 22, 105, 41, 30, 75, 121, 55, 47,
             121, 24,  16,  33,  97, 24,  3,  37, 45, 6,   56, 57
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'int8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js b/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
index 2e490bd1ecb..93549ad3cfe 100644
--- a/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
@@ -28,7 +28,7 @@ const ceilTests = [
       'inputs': {
         'ceilInput': {
           'data': [67.38941955566406],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -37,10 +37,8 @@ const ceilTests = [
         'outputs': 'ceilOutput'
       }],
       'expectedOutputs': {
-        'ceilOutput': {
-          'data': [68],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'ceilOutput':
+            {'data': [68], 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -59,7 +57,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -73,7 +71,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -93,7 +91,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -107,7 +105,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -127,7 +125,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -141,7 +139,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -161,7 +159,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -175,7 +173,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -195,7 +193,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -209,7 +207,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -229,7 +227,7 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -243,7 +241,7 @@ const ceilTests = [
             68, 37, 100, -22, 33, 18,  6,  13, 84, -29, 20,  66,
             27, 25, -48, -5,  62, -87, 70, 6,  85, -9,  -27, -34
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js b/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
index 115ddabc6d6..083eca7128c 100644
--- a/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
@@ -19,14 +19,6 @@
 //
 // MLOperand clamp(MLOperand input, optional MLClampOptions options = {});
 
-
-const getClampPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 0, float16: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const clampTests = [
   {
     'name': 'clamp float32 0D tensor default options',
@@ -34,7 +26,7 @@ const clampTests = [
       'inputs': {
         'clampInput': {
           'data': [-9.817828178405762],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -45,7 +37,7 @@ const clampTests = [
       'expectedOutputs': {
         'clampOutput': {
           'data': [-9.817828178405762],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -65,7 +57,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -86,7 +78,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -106,7 +98,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -126,7 +118,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -146,7 +138,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -166,7 +158,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -186,7 +178,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -206,7 +198,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -226,7 +218,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -246,7 +238,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -266,7 +258,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -286,7 +278,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -307,7 +299,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -343,7 +335,7 @@ const clampTests = [
             7.409400463104248,
             -1
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -364,7 +356,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [6, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -400,7 +392,7 @@ const clampTests = [
             7.409400463104248,
             0
           ],
-          'descriptor': {'dimensions': [6, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -421,7 +413,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -457,7 +449,7 @@ const clampTests = [
             7.409400463104248,
             1
           ],
-          'descriptor': {'dimensions': [3, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 8], dataType: 'float32'}
         }
       }
     }
@@ -478,7 +470,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -514,7 +506,7 @@ const clampTests = [
             -2,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -535,7 +527,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -571,7 +563,7 @@ const clampTests = [
             0,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -592,7 +584,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -628,7 +620,7 @@ const clampTests = [
             3,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2], dataType: 'float32'}
         }
       }
     }
@@ -649,7 +641,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 2, 1, 1, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1, 1, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -687,7 +679,7 @@ const clampTests = [
             -1,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [3, 2, 1, 1, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1, 1, 4], dataType: 'float32'}
         }
       }
     }
@@ -708,7 +700,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [1, 4, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 3, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -746,7 +738,7 @@ const clampTests = [
             0,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [1, 4, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -767,7 +759,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 6, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 6, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -805,7 +797,7 @@ const clampTests = [
             4,
             -2.123614549636841
           ],
-          'descriptor': {'dimensions': [2, 6, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 6, 2], dataType: 'float32'}
         }
       }
     }
@@ -826,7 +818,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [6, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -864,7 +856,7 @@ const clampTests = [
             6,
             0
           ],
-          'descriptor': {'dimensions': [6, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4], dataType: 'float32'}
         }
       }
     }
@@ -885,7 +877,7 @@ const clampTests = [
             -2.3130595684051514, 9.549695014953613,  5.788925647735596,
             5.549378395080566,   7.409400463104248,  -2.123614549636841
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -923,7 +915,7 @@ const clampTests = [
             7,
             2
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -932,8 +924,7 @@ const clampTests = [
 
 if (navigator.ml) {
   clampTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getClampPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.js b/tests/wpt/tests/webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.js
index e1e647ee50c..c150992ca64 100644
--- a/tests/wpt/tests/webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.js
@@ -27,7 +27,7 @@ if (navigator.ml) {
 
   promise_test(async t => {
     const builder = new MLGraphBuilder(context);
-    const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
+    const a = builder.input('a', {dataType: 'float32', shape: [2]});
     const b = builder.relu(a);
     const graph = await builder.build({b});
     const arraybuffer = new ArrayBuffer(100);
@@ -43,7 +43,7 @@ if (navigator.ml) {
 
   promise_test(async t => {
     const builder = new MLGraphBuilder(context);
-    const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
+    const a = builder.input('a', {dataType: 'float32', shape: [2]});
     const b = builder.relu(a);
     const graph = await builder.build({b});
     const aBuffer = new Float32Array(2);
diff --git a/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js b/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
index 6beb089e84e..bb6a92a93b6 100644
--- a/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
@@ -67,7 +67,7 @@ const buildGraphAndComputeWithConcat =
 
   // Execute the compiled graph.
   const result = await context.compute(graph, inputs, outputs);
-  return result;
+  return {result, namedOutputOperand};
 };
 
 const concatTests = [
@@ -82,7 +82,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'},
+          'descriptor': {shape: [12], dataType: 'float32'},
           'constant': true
         },
         'concatInput2': {
@@ -92,7 +92,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'},
+          'descriptor': {shape: [12], dataType: 'float32'},
           'constant': true
         }
       },
@@ -114,7 +114,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -130,7 +130,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -139,7 +139,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -176,7 +176,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float16'}
+          'descriptor': {shape: [12], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -185,7 +185,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float16'}
+          'descriptor': {shape: [12], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -204,7 +204,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       }
     }
@@ -219,7 +219,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -227,7 +227,7 @@ const concatTests = [
             0.11028251051902771, -0.5945112705230713, -0.402848482131958,
             -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -236,7 +236,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -259,7 +259,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -274,7 +274,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float16'}
+          'descriptor': {shape: [4], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -282,7 +282,7 @@ const concatTests = [
             0.11028251051902771, -0.5945112705230713, -0.402848482131958,
             -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float16'}
+          'descriptor': {shape: [8], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -291,7 +291,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float16'}
+          'descriptor': {shape: [12], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -312,7 +312,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       }
     }
@@ -326,28 +326,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -373,7 +373,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -387,28 +387,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float16'}
+          'descriptor': {shape: [6], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float16'}
+          'descriptor': {shape: [6], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float16'}
+          'descriptor': {shape: [6], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float16'}
+          'descriptor': {shape: [6], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -432,7 +432,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       }
     }
@@ -444,14 +444,14 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'}
+          'descriptor': {shape: [2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             0.337996244430542, -0.990639865398407, 0.576785683631897,
             0.32276400923728943
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -459,7 +459,7 @@ const concatTests = [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
@@ -468,7 +468,7 @@ const concatTests = [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [10], 'dataType': 'float32'}
+          'descriptor': {shape: [10], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -494,7 +494,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -506,14 +506,14 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989],
-          'descriptor': {'dimensions': [2], 'dataType': 'float16'}
+          'descriptor': {shape: [2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             0.337996244430542, -0.990639865398407, 0.576785683631897,
             0.32276400923728943
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float16'}
+          'descriptor': {shape: [4], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -521,7 +521,7 @@ const concatTests = [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float16'}
+          'descriptor': {shape: [8], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
@@ -530,7 +530,7 @@ const concatTests = [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [10], 'dataType': 'float16'}
+          'descriptor': {shape: [10], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -554,7 +554,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       }
     }
@@ -570,7 +570,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [2, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 6], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -579,7 +579,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -600,7 +600,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -616,7 +616,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [2, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 6], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -625,7 +625,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 6], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -644,7 +644,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
         }
       }
     }
@@ -659,7 +659,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -670,7 +670,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -691,7 +691,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -706,7 +706,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 6], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -717,7 +717,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 6], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -736,7 +736,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
         }
       }
     }
@@ -750,28 +750,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -797,7 +797,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         }
       }
     }
@@ -811,28 +811,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -856,7 +856,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [12, 2], dataType: 'float16'}
         }
       }
     }
@@ -876,14 +876,14 @@ const concatTests = [
             -0.9158143401145935,  -0.7206121683120728,  -0.7993468642234802,
             0.6653800010681152,   0.03886038810014725
           ],
-          'descriptor': {'dimensions': [2, 10], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 10], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -904,7 +904,7 @@ const concatTests = [
             -0.7206121683120728,  -0.7993468642234802, 0.6653800010681152,
             0.03886038810014725,  -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12], dataType: 'float32'}
         }
       }
     }
@@ -924,14 +924,14 @@ const concatTests = [
             -0.9158143401145935,  -0.7206121683120728,  -0.7993468642234802,
             0.6653800010681152,   0.03886038810014725
           ],
-          'descriptor': {'dimensions': [2, 10], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 10], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -950,7 +950,7 @@ const concatTests = [
             -0.341796875,  -0.916015625,      -0.720703125,   -0.79931640625,
             0.66552734375, 0.038848876953125, -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 12], dataType: 'float16'}
         }
       }
     }
@@ -965,7 +965,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -973,7 +973,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -981,7 +981,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1004,7 +1004,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.3418811559677124,
             -0.9158143401145935,  -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -1019,7 +1019,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1027,7 +1027,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -1035,7 +1035,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1056,7 +1056,7 @@ const concatTests = [
             0.51806640625, -0.8740234375,  -0.447265625,   0.11029052734375,
             -0.341796875,  -0.916015625,   -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
         }
       }
     }
@@ -1068,21 +1068,21 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
@@ -1090,7 +1090,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1116,7 +1116,7 @@ const concatTests = [
             -0.5945112705230713, -0.15864109992980957, -0.3418811559677124,
             -0.8742017149925232, -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 8], dataType: 'float32'}
         }
       }
     }
@@ -1128,21 +1128,21 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [3, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 1], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
@@ -1150,7 +1150,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1176,7 +1176,7 @@ const concatTests = [
             -0.5947265625,  -0.15869140625, -0.341796875,
             -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [3, 8], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 8], dataType: 'float16'}
         }
       }
     }
@@ -1191,7 +1191,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [2, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -1202,7 +1202,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [6, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1223,7 +1223,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [8, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -1238,7 +1238,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [2, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 1, 3], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1249,7 +1249,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [6, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [6, 1, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1268,7 +1268,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [8, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [8, 1, 3], dataType: 'float16'}
         }
       }
     }
@@ -1280,21 +1280,21 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713
           ],
-          'descriptor': {'dimensions': [3, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124
           ],
-          'descriptor': {'dimensions': [3, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
@@ -1302,7 +1302,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1328,7 +1328,7 @@ const concatTests = [
             -0.5945112705230713, -0.15864109992980957, -0.3418811559677124,
             -0.8742017149925232, -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 8, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 8, 1], dataType: 'float32'}
         }
       }
     }
@@ -1340,21 +1340,21 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 1, 1], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713
           ],
-          'descriptor': {'dimensions': [3, 2, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2, 1], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349,
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124
           ],
-          'descriptor': {'dimensions': [3, 2, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 2, 1], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
@@ -1362,7 +1362,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 3, 1], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1388,7 +1388,7 @@ const concatTests = [
             -0.5947265625,  -0.15869140625, -0.341796875,
             -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [3, 8, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 8, 1], dataType: 'float16'}
         }
       }
     }
@@ -1403,7 +1403,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -1411,7 +1411,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -1419,7 +1419,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1442,7 +1442,7 @@ const concatTests = [
             -0.44735023379325867, 0.11028251051902771, -0.3418811559677124,
             -0.9158143401145935,  -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 6], dataType: 'float32'}
         }
       }
     }
@@ -1457,7 +1457,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1465,7 +1465,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -1473,7 +1473,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1494,7 +1494,7 @@ const concatTests = [
             0.51806640625, -0.8740234375,  -0.447265625,   0.11029052734375,
             -0.341796875,  -0.916015625,   -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [2, 2, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 6], dataType: 'float16'}
         }
       }
     }
@@ -1509,7 +1509,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -1520,7 +1520,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3, 1, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1541,7 +1541,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -1556,7 +1556,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1567,7 +1567,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 3, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 3, 1, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1586,7 +1586,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [4, 3, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 3, 1, 2], dataType: 'float16'}
         }
       }
     }
@@ -1601,7 +1601,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -1609,7 +1609,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -1617,7 +1617,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1640,7 +1640,7 @@ const concatTests = [
             -0.3418811559677124, -0.9158143401145935, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 6, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 6, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -1655,7 +1655,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1663,7 +1663,7 @@ const concatTests = [
             -0.6731740236282349, 0.49189892411231995, -0.15864109992980957,
             -0.3418811559677124, -0.9158143401145935
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -1671,7 +1671,7 @@ const concatTests = [
             0.03886038810014725, 0.5182055234909058, -0.8742017149925232,
             -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1692,7 +1692,7 @@ const concatTests = [
             0.491943359375, -0.15869140625, -0.341796875,   -0.916015625,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [2, 6, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 6, 1, 2], dataType: 'float16'}
         }
       }
     }
@@ -1707,7 +1707,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -1718,14 +1718,14 @@ const concatTests = [
             -0.7206121683120728, -0.7993468642234802, 0.6653800010681152,
             0.03886038810014725
           ],
-          'descriptor': {'dimensions': [1, 2, 8, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 8, 1], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1748,7 +1748,7 @@ const concatTests = [
             -0.7206121683120728,  -0.7993468642234802,  0.6653800010681152,
             0.03886038810014725,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 12, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 12, 1], dataType: 'float32'}
         }
       }
     }
@@ -1763,7 +1763,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -1774,14 +1774,14 @@ const concatTests = [
             -0.7206121683120728, -0.7993468642234802, 0.6653800010681152,
             0.03886038810014725
           ],
-          'descriptor': {'dimensions': [1, 2, 8, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 8, 1], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1802,7 +1802,7 @@ const concatTests = [
             -0.341796875,  -0.916015625,      -0.720703125,   -0.79931640625,
             0.66552734375, 0.038848876953125, -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [1, 2, 12, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 12, 1], dataType: 'float16'}
         }
       }
     }
@@ -1814,18 +1814,18 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [1, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 1], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [-0.990639865398407, 0.576785683631897, 0.32276400923728943],
-          'descriptor': {'dimensions': [1, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 1], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 2], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
@@ -1834,7 +1834,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1860,7 +1860,7 @@ const concatTests = [
             -0.9531654119491577, -0.6731740236282349, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 1, 8], dataType: 'float32'}
         }
       }
     }
@@ -1872,18 +1872,18 @@ const concatTests = [
       'inputs': {
         'concatInput1': {
           'data': [-0.3944413363933563, 0.861982524394989, 0.337996244430542],
-          'descriptor': {'dimensions': [1, 3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 1], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [-0.990639865398407, 0.576785683631897, 0.32276400923728943],
-          'descriptor': {'dimensions': [1, 3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 1], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 2], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
@@ -1892,7 +1892,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 4], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 4], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -1916,7 +1916,7 @@ const concatTests = [
             0.337890625,    0.32275390625,  -0.953125,      -0.67333984375,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [1, 3, 1, 8], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 3, 1, 8], dataType: 'float16'}
         }
       }
     }
@@ -1930,28 +1930,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float32'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1977,7 +1977,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [4, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 1, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -1991,28 +1991,28 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
             -0.44735023379325867, 0.11028251051902771, -0.5945112705230713,
             -0.402848482131958, -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
             0.49189892411231995, -0.15864109992980957, -0.3418811559677124,
             -0.9158143401145935, -0.7206121683120728, -0.7993468642234802
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float16'}
         },
         'concatInput4': {
           'data': [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -2036,7 +2036,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [4, 2, 1, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 2, 1, 1, 3], dataType: 'float16'}
         }
       }
     }
@@ -2051,7 +2051,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 1, 1], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -2062,7 +2062,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 6, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6, 3, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2083,7 +2083,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 8, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 3, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -2098,7 +2098,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 3, 1, 1], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -2109,7 +2109,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 6, 3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 6, 3, 1, 1], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -2128,7 +2128,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [1, 8, 3, 1, 1], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 8, 3, 1, 1], dataType: 'float16'}
         }
       }
     }
@@ -2143,7 +2143,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -2151,7 +2151,7 @@ const concatTests = [
             0.11028251051902771, -0.5945112705230713, -0.402848482131958,
             -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 1, 2], dataType: 'float32'}
         },
         'concatInput3': {
           'data': [
@@ -2160,7 +2160,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 1, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2183,7 +2183,7 @@ const concatTests = [
             0.6653800010681152,  0.03886038810014725,  0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998,  0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 6, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 6, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -2198,7 +2198,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -2206,7 +2206,7 @@ const concatTests = [
             0.11028251051902771, -0.5945112705230713, -0.402848482131958,
             -0.9531654119491577, -0.6731740236282349
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 2, 1, 2], dataType: 'float16'}
         },
         'concatInput3': {
           'data': [
@@ -2215,7 +2215,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 3, 1, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -2236,7 +2236,7 @@ const concatTests = [
             -0.953125,     -0.67333984375,   0.66552734375,  0.038848876953125,
             0.51806640625, -0.8740234375,    -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [1, 2, 6, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 6, 1, 2], dataType: 'float16'}
         }
       }
     }
@@ -2251,7 +2251,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 1, 2], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -2262,7 +2262,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 3, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2283,7 +2283,7 @@ const concatTests = [
             0.6653800010681152,  0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 4, 2], dataType: 'float32'}
         }
       }
     }
@@ -2298,7 +2298,7 @@ const concatTests = [
             -0.3944413363933563, 0.861982524394989, 0.337996244430542,
             -0.990639865398407, 0.576785683631897, 0.32276400923728943
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 1, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 1, 1, 1, 2], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -2309,7 +2309,7 @@ const concatTests = [
             0.6653800010681152, 0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232, -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 3, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 1, 1, 3, 2], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -2328,7 +2328,7 @@ const concatTests = [
             0.57666015625, 0.32275390625,  0.66552734375,  0.038848876953125,
             0.51806640625, -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 4, 2], 'dataType': 'float16'}
+          'descriptor': {shape: [3, 1, 1, 4, 2], dataType: 'float16'}
         }
       }
     }
@@ -2344,7 +2344,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 4], dataType: 'float32'}
         },
         'concatInput2': {
           'data': [
@@ -2355,7 +2355,7 @@ const concatTests = [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2376,7 +2376,7 @@ const concatTests = [
             0.6653800010681152,   0.03886038810014725, 0.5182055234909058,
             -0.8742017149925232,  -0.4790218770503998, 0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 12], dataType: 'float32'}
         }
       }
     }
@@ -2392,7 +2392,7 @@ const concatTests = [
             -0.990639865398407, 0.576785683631897, 0.32276400923728943,
             -0.44735023379325867, 0.11028251051902771
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 4], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 4], dataType: 'float16'}
         },
         'concatInput2': {
           'data': [
@@ -2403,7 +2403,7 @@ const concatTests = [
             0.5182055234909058, -0.8742017149925232, -0.4790218770503998,
             0.1211843192577362
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 8], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 8], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -2422,7 +2422,7 @@ const concatTests = [
             -0.720703125,   -0.79931640625, 0.66552734375,  0.038848876953125,
             0.51806640625,  -0.8740234375,  -0.47900390625, 0.12115478515625
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 12], 'dataType': 'float16'}
+          'descriptor': {shape: [1, 2, 1, 1, 12], dataType: 'float16'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js b/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
index b3354728634..3cb964bc3b7 100644
--- a/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
@@ -51,7 +51,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -59,7 +59,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -74,7 +74,7 @@ const conv2dTests = [
             1.071682333946228, 1.1259644031524658, 1.4713115692138672,
             1.078782320022583, 1.155018925666809, 1.656954288482666
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -96,7 +96,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'},
           'constant': true
         },
         'conv2dFilter': {
@@ -105,7 +105,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -121,7 +121,7 @@ const conv2dTests = [
             1.071682333946228, 1.1259644031524658, 1.4713115692138672,
             1.078782320022583, 1.155018925666809, 1.656954288482666
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -142,7 +142,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -150,7 +150,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -166,7 +166,7 @@ const conv2dTests = [
             1.071682333946228, 1.1259644031524658, 1.4713115692138672,
             1.078782320022583, 1.155018925666809, 1.656954288482666
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -187,7 +187,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -195,7 +195,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -220,7 +220,7 @@ const conv2dTests = [
             0.7545653581619263, 0.7729666829109192, 0.9733180403709412,
             0.9025675058364868
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -241,7 +241,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -249,7 +249,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -267,7 +267,7 @@ const conv2dTests = [
             1.5323282480239868, 1.3641656637191772, 1.078782320022583,
             1.656954288482666
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -288,7 +288,7 @@ const conv2dTests = [
             0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
             0.21529443562030792
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -296,7 +296,7 @@ const conv2dTests = [
             0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
             0.3805030882358551, 0.19443586468696594, 0.5686976909637451
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -311,7 +311,7 @@ const conv2dTests = [
       'expectedOutputs': {
         'conv2dOutput': {
           'data': [1.3599307537078857],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -330,7 +330,7 @@ const conv2dTests = [
             0.25327208638191223, 0.5780375599861145, 0.5414554476737976,
             0.37846308946609497
           ],
-          'descriptor': {'dimensions': [1, 4, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 2, 2], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -341,7 +341,7 @@ const conv2dTests = [
             0.5900803804397583, 0.9690897464752197, 0.23175589740276337,
             0.14805112779140472
           ],
-          'descriptor': {'dimensions': [4, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -359,7 +359,7 @@ const conv2dTests = [
             1.1808103322982788, 1.165167212486267, 1.311646819114685,
             0.8911385536193848
           ],
-          'descriptor': {'dimensions': [1, 4, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -378,7 +378,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -387,7 +387,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -411,7 +411,7 @@ const conv2dTests = [
             0.816078782081604,   0.6780439019203186, 0.9170808792114258,
             1.082636833190918,   1.2353861331939697, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -430,7 +430,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -439,7 +439,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -463,7 +463,7 @@ const conv2dTests = [
             0.8282973766326904,  0.816078782081604,  1.2353861331939697,
             0.35335418581962585, 0.6780439019203186, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -482,7 +482,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -491,7 +491,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -515,7 +515,7 @@ const conv2dTests = [
             0.816078782081604,   0.6780439019203186, 0.9170808792114258,
             1.082636833190918,   1.2353861331939697, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -534,7 +534,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -543,7 +543,7 @@ const conv2dTests = [
             0.10836050659418106, 0.08139707148075104, 0.9849002361297607,
             0.3202308118343353, 0.5303338766098022, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -567,7 +567,7 @@ const conv2dTests = [
             0.816078782081604,   0.6780439019203186, 0.9170808792114258,
             1.082636833190918,   1.2353861331939697, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -586,7 +586,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -595,7 +595,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 2, 2, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -619,7 +619,7 @@ const conv2dTests = [
             0.816078782081604,   0.6780439019203186, 0.9170808792114258,
             1.082636833190918,   1.2353861331939697, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -638,7 +638,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -647,7 +647,7 @@ const conv2dTests = [
             0.10836050659418106, 0.08139707148075104, 0.9849002361297607,
             0.3202308118343353, 0.5303338766098022, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -671,7 +671,7 @@ const conv2dTests = [
             0.816078782081604,   0.6780439019203186, 0.9170808792114258,
             1.082636833190918,   1.2353861331939697, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -690,7 +690,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -699,7 +699,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -723,7 +723,7 @@ const conv2dTests = [
             0.8282973766326904,  0.816078782081604,  1.2353861331939697,
             0.35335418581962585, 0.6780439019203186, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -742,7 +742,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -751,7 +751,7 @@ const conv2dTests = [
             0.10836050659418106, 0.08139707148075104, 0.9849002361297607,
             0.3202308118343353, 0.5303338766098022, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -775,7 +775,7 @@ const conv2dTests = [
             0.8282973766326904,  0.816078782081604,  1.2353861331939697,
             0.35335418581962585, 0.6780439019203186, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -794,7 +794,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -803,7 +803,7 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 2, 2, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -827,7 +827,7 @@ const conv2dTests = [
             0.8282973766326904,  0.816078782081604,  1.2353861331939697,
             0.35335418581962585, 0.6780439019203186, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -846,7 +846,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -855,7 +855,7 @@ const conv2dTests = [
             0.10836050659418106, 0.08139707148075104, 0.9849002361297607,
             0.3202308118343353, 0.5303338766098022, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -879,7 +879,7 @@ const conv2dTests = [
             0.8282973766326904,  0.816078782081604,  1.2353861331939697,
             0.35335418581962585, 0.6780439019203186, 0.9810346961021423
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -897,7 +897,7 @@ const conv2dTests = [
             0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
             0.6765284538269043, 0.6193256378173828, 0.3929215967655182
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -906,12 +906,12 @@ const conv2dTests = [
             0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
             0.43241235613822937, 0.9849002361297607, 0.4281076192855835
           ],
-          'descriptor': {'dimensions': [3, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
           'constant': true
         },
         'conv2dBias': {
           'data': [0.8135762214660645, 0.8394582867622375, 0.49444812536239624],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -935,7 +935,7 @@ const conv2dTests = [
             1.6555371284484863, 1.5175021886825562, 1.4115289449691772,
             1.577085018157959,  1.7298341989517212, 1.4754828214645386
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -964,7 +964,7 @@ const conv2dTests = [
             0.2968284785747528,   0.7524365782737732,  0.029636209830641747,
             0.09028015285730362,  0.77818763256073
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -972,12 +972,12 @@ const conv2dTests = [
             0.45633891224861145, 0.40438535809516907, 0.5943626761436462,
             0.14241264760494232, 0.9036700129508972
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float32'},
           'constant': true
         },
         'conv2dBias': {
           'data': [0.542375385761261, 0.8406118750572205],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'},
+          'descriptor': {shape: [2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1019,7 +1019,7 @@ const conv2dTests = [
             2.0131523609161377, 1.4835525751113892, 1.1790242195129395,
             2.0776233673095703, 1.378482699394226
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1049,7 +1049,7 @@ const conv2dTests = [
             -0.3751019835472107,  -0.7108227610588074,  -0.36050301790237427,
             -0.5468712449073792,  -0.032261595129966736
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         },
         'conv2dFilter': {
           'data': [
@@ -1057,12 +1057,12 @@ const conv2dTests = [
             0.45633891224861145, 0.40438535809516907, 0.5943626761436462,
             0.14241264760494232, 0.9036700129508972
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float32'},
           'constant': true
         },
         'conv2dBias': {
           'data': [-0.37496936321258545, -0.4363507032394409],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'},
+          'descriptor': {shape: [2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1101,7 +1101,7 @@ const conv2dTests = [
             -1.5352842807769775, -1.303133249282837,  -1.3232042789459229,
             -1.1430623531341553, -0.5107623338699341
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1110,8 +1110,7 @@ const conv2dTests = [
 
 if (navigator.ml) {
   conv2dTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getConv2dPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js b/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
index a76f180b556..1833f5ce473 100644
--- a/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
@@ -45,14 +45,14 @@ const convTranspose2dTests = [
             0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
             0.2614607512950897
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
             0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
             0.0033378428779542446
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -69,7 +69,7 @@ const convTranspose2dTests = [
             0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
             0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -84,7 +84,7 @@ const convTranspose2dTests = [
             0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
             0.2614607512950897
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         },
         'convTranspose2dFilter': {
@@ -92,7 +92,7 @@ const convTranspose2dTests = [
             0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
             0.0033378428779542446
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -110,7 +110,7 @@ const convTranspose2dTests = [
             0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
             0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -125,14 +125,14 @@ const convTranspose2dTests = [
             0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
             0.2614607512950897
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
             0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
             0.0033378428779542446
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -150,7 +150,7 @@ const convTranspose2dTests = [
             0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
             0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -166,7 +166,7 @@ const convTranspose2dTests = [
             0.36564111709594727, 0.25429198145866394, 0.20815767347812653,
             0.7023073434829712, 0.5734469890594482
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -174,7 +174,7 @@ const convTranspose2dTests = [
             0.6582807898521423, 0.9634373188018799, 0.012118860147893429,
             0.9230011701583862, 0.4781944155693054
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -196,7 +196,7 @@ const convTranspose2dTests = [
             0.9113409519195557, 0.8747221827507019, 0.10648936033248901,
             0.6482304930686951, 0.865131676197052, 0.2742191553115845
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -212,7 +212,7 @@ const convTranspose2dTests = [
             0.36564111709594727, 0.25429198145866394, 0.20815767347812653,
             0.7023073434829712, 0.5734469890594482
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -220,7 +220,7 @@ const convTranspose2dTests = [
             0.6582807898521423, 0.9634373188018799, 0.012118860147893429,
             0.9230011701583862, 0.4781944155693054
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -248,7 +248,7 @@ const convTranspose2dTests = [
             0.00694952392950654, 0.6482304930686951,   0.3358394503593445,
             0.5292922258377075,  0.2742191553115845
           ],
-          'descriptor': {'dimensions': [1, 2, 4, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 4, 4], dataType: 'float32'}
         }
       }
     }
@@ -263,14 +263,14 @@ const convTranspose2dTests = [
             0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
             0.2614607512950897
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
             0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
             0.0033378428779542446
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -286,7 +286,7 @@ const convTranspose2dTests = [
       'expectedOutputs': {
         'convTranspose2dOutput': {
           'data': [0.2787136137485504],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -297,11 +297,11 @@ const convTranspose2dTests = [
       'inputs': {
         'convTranspose2dInput': {
           'data': [0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -333,7 +333,7 @@ const convTranspose2dTests = [
             1,   1,   1,   1,   2, 2, 1,   1,   2, 2, 1,   1,
             0.5, 0.5, 0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5
           ],
-          'descriptor': {'dimensions': [1, 6, 6, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6, 6, 2], dataType: 'float32'}
         }
       }
     }
@@ -349,7 +349,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -360,7 +360,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -418,7 +418,7 @@ const convTranspose2dTests = [
             0.04055071249604225,  0.27599334716796875,   0.3911670744419098,
             0.3143731355667114,   0.26951852440834045,   0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 2, 9, 7], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 9, 7], dataType: 'float32'}
         }
       }
     }
@@ -434,14 +434,14 @@ const convTranspose2dTests = [
             0.47982943058013916, 0.76741623878479, 0.9083173871040344,
             0.6205142140388489, 0.6580719947814941, 0.6553052067756653
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
             0.6835425496101379, 0.9641214609146118, 0.8272836804389954,
             0.5771222710609436
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         }
       },
@@ -467,7 +467,7 @@ const convTranspose2dTests = [
             0.5444121956825256,  0.9002358913421631,  0.37978801131248474,
             0.3781912326812744
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -483,7 +483,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -494,7 +494,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -671,7 +671,7 @@ const convTranspose2dTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [1, 2, 10, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 10, 8], dataType: 'float32'}
         }
       }
     }
@@ -687,7 +687,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -698,7 +698,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -875,7 +875,7 @@ const convTranspose2dTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [1, 2, 10, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 10, 8], dataType: 'float32'}
         }
       }
     }
@@ -891,7 +891,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -902,7 +902,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -936,7 +936,7 @@ const convTranspose2dTests = [
             0.027173593640327454, 0.3026771545410156,  0.5856420397758484,
             0.40328359603881836,  0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -952,7 +952,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -963,7 +963,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -997,7 +997,7 @@ const convTranspose2dTests = [
             0.5856420397758484,  1.2216601371765137,  0.40328359603881836,
             0.45846959948539734, 0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       }
     }
@@ -1013,7 +1013,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1024,7 +1024,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1058,7 +1058,7 @@ const convTranspose2dTests = [
             0.027173593640327454, 0.3026771545410156,  0.5856420397758484,
             0.40328359603881836,  0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1074,7 +1074,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1085,7 +1085,7 @@ const convTranspose2dTests = [
             0.3285411298274994, 0.28385090827941895, 0.8742373585700989,
             0.4235861301422119, 0.7205492258071899, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [3, 3, 2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 3, 2, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1119,7 +1119,7 @@ const convTranspose2dTests = [
             0.027173593640327454, 0.3026771545410156,  0.5856420397758484,
             0.40328359603881836,  0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1135,7 +1135,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1146,7 +1146,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1180,7 +1180,7 @@ const convTranspose2dTests = [
             0.027173593640327454, 0.3026771545410156,  0.5856420397758484,
             0.40328359603881836,  0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1196,7 +1196,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1207,7 +1207,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1241,7 +1241,7 @@ const convTranspose2dTests = [
             0.5856420397758484,  1.2216601371765137,  0.40328359603881836,
             0.45846959948539734, 0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       }
     }
@@ -1257,7 +1257,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1268,7 +1268,7 @@ const convTranspose2dTests = [
             0.3285411298274994, 0.28385090827941895, 0.8742373585700989,
             0.4235861301422119, 0.7205492258071899, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [3, 3, 2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 3, 2, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1302,7 +1302,7 @@ const convTranspose2dTests = [
             0.5856420397758484,  1.2216601371765137,  0.40328359603881836,
             0.45846959948539734, 0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       }
     }
@@ -1318,7 +1318,7 @@ const convTranspose2dTests = [
             0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
             0.09573192149400711, 0.9234652519226074, 0.636277973651886
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1329,7 +1329,7 @@ const convTranspose2dTests = [
             0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
             0.28385090827941895, 0.4235861301422119, 0.1448512077331543
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1363,7 +1363,7 @@ const convTranspose2dTests = [
             0.5856420397758484,  1.2216601371765137,  0.40328359603881836,
             0.45846959948539734, 0.09216563403606415
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       }
     }
@@ -1378,7 +1378,7 @@ const convTranspose2dTests = [
             0.43077003955841064, 0.5981627106666565, 0.12321650236845016,
             0.1610974818468094, 0.0884026437997818, 0.29100972414016724
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1386,12 +1386,12 @@ const convTranspose2dTests = [
             0.8730561137199402, 0.8309102058410645, 0.854960560798645,
             0.5552039742469788, 0.840092122554779, 0.85308438539505
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         },
         'convTranspose2dBias': {
           'data': [0.451673686504364],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1417,7 +1417,7 @@ const convTranspose2dTests = [
             0.6360918879508972, 0.8249395489692688, 0.7715635895729065,
             0.6999295353889465
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1433,7 +1433,7 @@ const convTranspose2dTests = [
             -0.5624061226844788, -0.7322093844413757, -0.8421320915222168,
             -0.30598655343055725, -0.976659893989563, -0.014158561825752258
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
         },
         'convTranspose2dFilter': {
           'data': [
@@ -1441,12 +1441,12 @@ const convTranspose2dTests = [
             0.8730561137199402, 0.8309102058410645, 0.854960560798645,
             0.5552039742469788, 0.840092122554779, 0.85308438539505
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
           'constant': true
         },
         'convTranspose2dBias': {
           'data': [-0.8457866311073303],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1472,7 +1472,7 @@ const convTranspose2dTests = [
             -1.645089030265808,  -1.935164213180542,  -1.6908544301986694,
             -0.8578650951385498
           ],
-          'descriptor': {'dimensions': [1, 1, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -1481,9 +1481,7 @@ const convTranspose2dTests = [
 
 if (navigator.ml) {
   convTranspose2dTests.forEach((test) => {
-    // reuse getConv2dPrecisionTolerance method for convTranspose2d tests
-    webnn_conformance_test(
-        buildGraphAndCompute, getConv2dPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/cos.https.any.js b/tests/wpt/tests/webnn/conformance_tests/cos.https.any.js
index 5ad92e7014a..4a50dff594b 100644
--- a/tests/wpt/tests/webnn/conformance_tests/cos.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/cos.https.any.js
@@ -28,7 +28,7 @@ const cosTests = [
       'inputs': {
         'cosInput': {
           'data': [85.56369018554688],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const cosTests = [
       'expectedOutputs': {
         'cosOutput': {
           'data': [-0.7380040884017944],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const cosTests = [
             -98.67289733886719, -63.6115608215332,   26.85724639892578,
             83.70417022705078,  76.56607055664062,   -47.83436584472656
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const cosTests = [
             -0.283336341381073,   0.7111190557479858,   -0.1531042903661728,
             -0.43673399090766907, 0.39213326573371887,  -0.7580515146255493
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js b/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
index 2939121c241..c6acb042a24 100644
--- a/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
@@ -31,17 +31,17 @@ const dequantizeLinearTests = [
       'inputs': {
         'dequantizeLinearInput': {
           'data': [123],
-          'descriptor': {'dimensions': [], 'dataType': 'int8'},
+          'descriptor': {shape: [], dataType: 'int8'},
           'constant': true
         },
         'dequantizeLinearScale': {
           'data': [1.1202747821807861],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         },
         'dequantizeLinearZeroPoint': {
           'data': [3],
-          'descriptor': {'dimensions': [], 'dataType': 'int8'},
+          'descriptor': {shape: [], dataType: 'int8'},
           'constant': true
         }
       },
@@ -57,7 +57,7 @@ const dequantizeLinearTests = [
       'expectedOutputs': {
         'dequantizeLinearOutput': {
           'data': [134.43296813964844],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -68,7 +68,7 @@ const dequantizeLinearTests = [
       'inputs': {
         'dequantizeLinearInput': {
           'data': [12, 24, 35, 123],
-          'descriptor': {'dimensions': [4], 'dataType': 'uint8'},
+          'descriptor': {shape: [4], dataType: 'uint8'},
           'constant': true
         },
         'dequantizeLinearScale': {
@@ -78,12 +78,12 @@ const dequantizeLinearTests = [
             -4.617084980010986,
             1.1202747821807861,
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'},
+          'descriptor': {shape: [4], dataType: 'float32'},
           'constant': true
         },
         'dequantizeLinearZeroPoint': {
           'data': [128],
-          'descriptor': {'dimensions': [], 'dataType': 'uint8'},
+          'descriptor': {shape: [], dataType: 'uint8'},
           'constant': true
         }
       },
@@ -102,7 +102,7 @@ const dequantizeLinearTests = [
             -1083.798828125, -29.127147674560547, 429.388916015625,
             -5.601373672485352
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       }
     }
@@ -114,17 +114,17 @@ const dequantizeLinearTests = [
       'inputs': {
         'dequantizeLinearInput': {
           'data': [-124, 0, 23, 122],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'int8'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'int8'},
           'constant': true
         },
         'dequantizeLinearScale': {
           'data': [0.2800687253475189, -4.617084980010986],
-          'descriptor': {'dimensions': [2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 1], dataType: 'float32'},
           'constant': true
         },
         'dequantizeLinearZeroPoint': {
           'data': [12],
-          'descriptor': {'dimensions': [], 'dataType': 'int8'},
+          'descriptor': {shape: [], dataType: 'int8'},
           'constant': true
         }
       },
@@ -143,7 +143,7 @@ const dequantizeLinearTests = [
             -38.08934783935547, -3.3608245849609375, -50.787933349609375,
             -507.87933349609375
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/div.https.any.js b/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
index 69183ee1097..2c36884ce91 100644
--- a/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
@@ -36,7 +36,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const divTests = [
             81.65287017822266,   48.2148323059082,    63.370121002197266,
             10.626384735107422,  46.126625061035156,  77.22327423095703
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const divTests = [
             0.058991268277168274, 0.9158834218978882,   -0.20645710825920105,
             4.193900108337402,    -0.7564564943313599,  -0.9594743251800537
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const divTests = [
       'inputs': {
         'inputA': {
           'data': [-41.827415466308594],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const divTests = [
             -8.683640480041504,  -0.9471967220306396, 3.1970295906066895,
             -0.9385499358177185, 1.19874107837677,    0.5645201802253723
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             97.32406616210938, 36.325218200683594, 26.037858963012695,
             99.47166442871094, 10.395523071289062, -30.788942337036133
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -427,7 +427,7 @@ const divTests = [
             0.049492448568344116, 1.2156614065170288,   -0.5024688243865967,
             0.4480270743370056,   -3.356520175933838,   2.4065051078796387
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -447,14 +447,14 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             75.08295440673828, -46.22666931152344, 15.761880874633789,
             8.9222993850708
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const divTests = [
             0.3055984377861023,  2.801643133163452,    -0.830053985118866,
             4.994900703430176,   -3.910738945007324,   -8.304333686828613
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -485,7 +485,7 @@ const divTests = [
       'inputs': {
         'inputA': {
           'data': [-41.827415466308594],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -498,7 +498,7 @@ const divTests = [
             4.816806316375732,   44.15916442871094,   -13.083211898803711,
             44.56599807739258,   -34.892784118652344, -74.09375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -518,7 +518,7 @@ const divTests = [
             -8.683640480041504,  -0.9471967220306396, 3.1970295906066895,
             -0.9385499358177185, 1.19874107837677,    0.5645201802253723
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
index 75b982944ba..ed4d0c42490 100644
--- a/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
@@ -19,14 +19,6 @@
 //
 // MLOperand elu(MLOperand input, optional MLEluOptions options = {});
 
-
-const getEluPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 18, float16: 18};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const eluTests = [
   {
     'name': 'elu float32 positive 0D scalar default options',
@@ -34,7 +26,7 @@ const eluTests = [
       'inputs': {
         'eluInput': {
           'data': [4.721739768981934],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -45,7 +37,7 @@ const eluTests = [
       'expectedOutputs': {
         'eluOutput': {
           'data': [4.721739768981934],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +48,7 @@ const eluTests = [
       'inputs': {
         'eluInput': {
           'data': [-3.8663666248321533],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -67,7 +59,7 @@ const eluTests = [
       'expectedOutputs': {
         'eluOutput': {
           'data': [-0.9790657162666321],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -87,7 +79,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -108,7 +100,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -128,7 +120,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -148,7 +140,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -168,7 +160,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -188,7 +180,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -208,7 +200,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -228,7 +220,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -248,7 +240,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -268,7 +260,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -288,7 +280,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -308,7 +300,7 @@ const eluTests = [
             -0.982044517993927,  7.114678382873535,   -0.10607059299945831,
             -0.9749990105628967, 6.135150909423828,   -0.99994957447052
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -328,7 +320,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -349,7 +341,7 @@ const eluTests = [
             -0.3542475700378418,  7.114678382873535,    -0.0382622666656971,
             -0.3517060875892639,  6.135150909423828,    -0.3607063591480255
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -369,7 +361,7 @@ const eluTests = [
             -4.01986026763916,   7.114678382873535,  -0.11212847381830215,
             -3.688840866088867,  6.135150909423828,  -9.895182609558105
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -390,7 +382,7 @@ const eluTests = [
             3.40590763092041,   7.114678382873535,  0.3678719699382782,
             3.381472587585449,  6.135150909423828,  3.468005657196045
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -399,8 +391,7 @@ const eluTests = [
 
 if (navigator.ml) {
   eluTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getEluPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/equal.https.any.js b/tests/wpt/tests/webnn/conformance_tests/equal.https.any.js
index c763786d4af..37cd0ca97dc 100644
--- a/tests/wpt/tests/webnn/conformance_tests/equal.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/equal.https.any.js
@@ -28,11 +28,11 @@ const equalTests = [
       'inputs': {
         'inputA': {
           'data': [-0.6285496950149536],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [-4.4166412353515625],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -41,8 +41,7 @@ const equalTests = [
         'outputs': 'output'
       }],
       'expectedOutputs': {
-        'output':
-            {'data': [0], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+        'output': {'data': [0], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -61,7 +60,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -75,7 +74,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -90,7 +89,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -110,7 +109,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -123,7 +122,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -137,7 +136,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -157,7 +156,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -170,7 +169,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -184,7 +183,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -204,7 +203,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -217,7 +216,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -231,7 +230,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -251,7 +250,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -264,7 +263,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -278,7 +277,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -298,7 +297,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -311,7 +310,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,  -9.041799545288086,
             -1.9728281497955322, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -325,7 +324,7 @@ const equalTests = [
             1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -336,7 +335,7 @@ const equalTests = [
       'inputs': {
         'inputA': {
           'data': [2.80570650100708],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -349,7 +348,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -363,7 +362,7 @@ const equalTests = [
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -374,7 +373,7 @@ const equalTests = [
       'inputs': {
         'inputA': {
           'data': [2.80570650100708],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -387,7 +386,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -401,7 +400,7 @@ const equalTests = [
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -421,14 +420,14 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             2.80570650100708, 5.588105201721191, -4.9622955322265625,
             -2.863192081451416, -3.011512279510498, 3.6268343925476074
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -442,7 +441,7 @@ const equalTests = [
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
             1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -462,14 +461,14 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             2.80570650100708, 5.588105201721191, -9.041799545288086,
             3.6268343925476074
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -483,7 +482,7 @@ const equalTests = [
             1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -494,7 +493,7 @@ const equalTests = [
       'inputs': {
         'inputA': {
           'data': [2.80570650100708],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -507,7 +506,7 @@ const equalTests = [
             2.80570650100708,    5.588105201721191,   -6.245251178741455,
             -2.8490731716156006, -2.6951117515563965, 5.817563056945801
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -521,7 +520,7 @@ const equalTests = [
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/erf.https.any.js b/tests/wpt/tests/webnn/conformance_tests/erf.https.any.js
index 78fc81ea74a..7e8a8e0c739 100644
--- a/tests/wpt/tests/webnn/conformance_tests/erf.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/erf.https.any.js
@@ -28,7 +28,7 @@ const erfTests = [
       'inputs': {
         'erfInput': {
           'data': [-0.004352752584964037],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const erfTests = [
       'expectedOutputs': {
         'erfOutput': {
           'data': [-0.004911554511636496],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const erfTests = [
             -0.8946002721786499, -0.3920256197452545, 0.6854220628738403,
             -0.6744900345802307, -0.439808189868927,  0.2709762454032898
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const erfTests = [
             -0.7941843867301941,  -0.4207003712654114,  0.6676210165023804,
             -0.6598520874977112,  -0.46604686975479126, 0.29844197630882263
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/exp.https.any.js b/tests/wpt/tests/webnn/conformance_tests/exp.https.any.js
index 9d67712ee60..7b1dae9ac8b 100644
--- a/tests/wpt/tests/webnn/conformance_tests/exp.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/exp.https.any.js
@@ -28,7 +28,7 @@ const expTests = [
       'inputs': {
         'expInput': {
           'data': [0.3421436548233032],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const expTests = [
       'expectedOutputs': {
         'expOutput': {
           'data': [1.4079625606536865],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const expTests = [
             -1.7085379362106323, -9.73737907409668,   -1.9747875928878784,
             8.203149795532227,   -7.267597675323486,  -3.5890684127807617
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const expTests = [
             0.18113042414188385,  0.0000590350573475007, 0.1387907862663269,
             3652.4365234375,      0.0006977862794883549, 0.02762405201792717
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/expand.https.any.js b/tests/wpt/tests/webnn/conformance_tests/expand.https.any.js
index 6f94795370f..6668a5cc216 100644
--- a/tests/wpt/tests/webnn/conformance_tests/expand.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/expand.https.any.js
@@ -30,7 +30,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -50,7 +50,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -61,7 +61,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -81,7 +81,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -92,7 +92,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -112,7 +112,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -143,7 +143,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -154,7 +154,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -174,7 +174,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -185,7 +185,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -206,7 +206,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -217,7 +217,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -237,7 +237,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -248,7 +248,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -268,7 +268,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -279,7 +279,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -299,7 +299,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -310,7 +310,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -330,7 +330,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -341,7 +341,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -361,7 +361,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -375,7 +375,7 @@ const expandTests = [
             10.898762702941895, -29.391416549682617, -73.74250793457031,
             22.456905364990234, -97.5792465209961, -76.95013427734375
           ],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -395,7 +395,7 @@ const expandTests = [
             10.898762702941895, -29.391416549682617, -73.74250793457031,
             22.456905364990234, -97.5792465209961,   -76.95013427734375
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -409,7 +409,7 @@ const expandTests = [
             4.965915679931641, 66.14382934570312, 75.28175354003906,
             49.998130798339844
           ],
-          'descriptor': {'dimensions': [4, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -429,7 +429,7 @@ const expandTests = [
             49.998130798339844, 49.998130798339844, 49.998130798339844,
             49.998130798339844, 49.998130798339844, 49.998130798339844
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -440,7 +440,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -460,7 +460,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -474,7 +474,7 @@ const expandTests = [
             4.965915679931641, 66.14382934570312, 75.28175354003906,
             49.998130798339844
           ],
-          'descriptor': {'dimensions': [4, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -494,7 +494,7 @@ const expandTests = [
             75.28175354003906,  75.28175354003906,  75.28175354003906,
             49.998130798339844, 49.998130798339844, 49.998130798339844
           ],
-          'descriptor': {'dimensions': [2, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -508,7 +508,7 @@ const expandTests = [
             10.898762702941895, -29.391416549682617, -73.74250793457031,
             22.456905364990234, -97.5792465209961, -76.95013427734375
           ],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -528,7 +528,7 @@ const expandTests = [
             10.898762702941895, -29.391416549682617, -73.74250793457031,
             22.456905364990234, -97.5792465209961,   -76.95013427734375
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 6], dataType: 'float32'}
         }
       }
     }
@@ -539,7 +539,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [-6.461850643157959],
-          'descriptor': {'dimensions': [1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -559,7 +559,7 @@ const expandTests = [
             -6.461850643157959, -6.461850643157959, -6.461850643157959,
             -6.461850643157959, -6.461850643157959, -6.461850643157959
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -570,7 +570,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [21.694129943847656, -72.82571411132812],
-          'descriptor': {'dimensions': [1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -590,7 +590,7 @@ const expandTests = [
             -72.82571411132812, -72.82571411132812, -72.82571411132812,
             -72.82571411132812, -72.82571411132812, -72.82571411132812
           ],
-          'descriptor': {'dimensions': [2, 2, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 6], dataType: 'float32'}
         }
       }
     }
@@ -601,7 +601,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [21.694129943847656, -72.82571411132812],
-          'descriptor': {'dimensions': [1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -621,7 +621,7 @@ const expandTests = [
             21.694129943847656, 21.694129943847656, 21.694129943847656,
             -72.82571411132812, -72.82571411132812, -72.82571411132812
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -632,7 +632,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [21.694129943847656, -72.82571411132812],
-          'descriptor': {'dimensions': [1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -652,7 +652,7 @@ const expandTests = [
             21.694129943847656, 21.694129943847656, 21.694129943847656,
             -72.82571411132812, -72.82571411132812, -72.82571411132812
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -663,7 +663,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [12.799123764038086, -26.550199508666992],
-          'descriptor': {'dimensions': [2, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -683,7 +683,7 @@ const expandTests = [
             -26.550199508666992, -26.550199508666992, -26.550199508666992,
             -26.550199508666992, -26.550199508666992, -26.550199508666992
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -694,7 +694,7 @@ const expandTests = [
       'inputs': {
         'expandInput': {
           'data': [12.799123764038086, -26.550199508666992],
-          'descriptor': {'dimensions': [2, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -714,7 +714,7 @@ const expandTests = [
             -26.550199508666992, -26.550199508666992, -26.550199508666992,
             -26.550199508666992, -26.550199508666992, -26.550199508666992
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 1, 2], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/floor.https.any.js b/tests/wpt/tests/webnn/conformance_tests/floor.https.any.js
index 4cca407cd4c..e59f220f4eb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/floor.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/floor.https.any.js
@@ -28,7 +28,7 @@ const floorTests = [
       'inputs': {
         'floorInput': {
           'data': [89.69458770751953],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -37,10 +37,8 @@ const floorTests = [
         'outputs': 'floorOutput'
       }],
       'expectedOutputs': {
-        'floorOutput': {
-          'data': [89],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'floorOutput':
+            {'data': [89], 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -59,7 +57,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -74,7 +72,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -94,7 +92,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -108,7 +106,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -128,7 +126,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -142,7 +140,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -162,7 +160,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -176,7 +174,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -196,7 +194,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -210,7 +208,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -230,7 +228,7 @@ const floorTests = [
             -39.83677673339844,  32.5257568359375,    -21.213542938232422,
             -80.30911254882812,  16.674850463867188,  -72.88893127441406
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -244,7 +242,7 @@ const floorTests = [
             89,  -80, -67, -72, 86,  6,  24,  0,  19,  0,   -25, 77,
             -34, 80,  44,  -38, -84, 65, -40, 32, -22, -81, 16,  -73
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/gather.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gather.https.any.js
index 3befa3818fc..3cdd411ecb3 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gather.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gather.https.any.js
@@ -44,11 +44,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [4],
-          'descriptor': {'dimensions': [], 'dataType': 'uint32'},
+          'descriptor': {shape: [], dataType: 'uint32'},
           'constant': true
         }
       },
@@ -60,7 +60,7 @@ const gatherTests = [
       'expectedOutputs': {
         'gatherOutput': {
           'data': [89.0337142944336],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -81,11 +81,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [4],
-          'descriptor': {'dimensions': [], 'dataType': 'int32'},
+          'descriptor': {shape: [], dataType: 'int32'},
           'constant': true
         }
       },
@@ -97,7 +97,7 @@ const gatherTests = [
       'expectedOutputs': {
         'gatherOutput': {
           'data': [89.0337142944336],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -118,11 +118,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [0],
-          'descriptor': {'dimensions': [], 'dataType': 'int64'},
+          'descriptor': {shape: [], dataType: 'int64'},
           'constant': true
         }
       },
@@ -134,7 +134,7 @@ const gatherTests = [
       'expectedOutputs': {
         'gatherOutput': {
           'data': [-66.05901336669922],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -154,11 +154,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [16, 20, 6, 11, 17, 19, 13, 17],
-          'descriptor': {'dimensions': [8], 'dataType': 'int64'},
+          'descriptor': {shape: [8], dataType: 'int64'},
           'constant': true
         }
       },
@@ -174,7 +174,7 @@ const gatherTests = [
             -50.42131042480469, -19.693084716796875, 43.11057662963867,
             55.620765686035156, -19.693084716796875
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       }
     }
@@ -194,11 +194,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [14, 9, 21, 17],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -213,7 +213,7 @@ const gatherTests = [
             44.92119598388672, 41.94132614135742, -7.699817180633545,
             -19.693084716796875
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -233,12 +233,12 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data':
               [17, 19, 14, 16, 13, 0, 5, 15, 18, 18, 6, 20, 7, 22, 5, 1, 4, 19],
-          'descriptor': {'dimensions': [2, 3, 3], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 3, 3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -257,7 +257,7 @@ const gatherTests = [
             48.81806945800781, 25.76774024963379, -45.89653396606445,
             -68.9197006225586, 89.0337142944336, 43.11057662963867
           ],
-          'descriptor': {'dimensions': [2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -277,11 +277,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [18, 18, 22, 11, 8, 15, 12, 11, 7, 13, 7, 7],
-          'descriptor': {'dimensions': [1, 2, 2, 3], 'dataType': 'int64'},
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -298,7 +298,7 @@ const gatherTests = [
             90.2870101928711, -50.42131042480469, 48.81806945800781,
             55.620765686035156, 48.81806945800781, 48.81806945800781
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -318,11 +318,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [11],
-          'descriptor': {'dimensions': [], 'dataType': 'int64'},
+          'descriptor': {shape: [], dataType: 'int64'},
           'constant': true
         }
       },
@@ -334,7 +334,7 @@ const gatherTests = [
       'expectedOutputs': {
         'gatherOutput': {
           'data': [25.76774024963379, 73.60064697265625],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'}
+          'descriptor': {shape: [2], dataType: 'float32'}
         }
       }
     }
@@ -354,11 +354,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [1, 10, 9, 0, 3, 5, 3, 8],
-          'descriptor': {'dimensions': [8], 'dataType': 'int64'},
+          'descriptor': {shape: [8], dataType: 'int64'},
           'constant': true
         }
       },
@@ -377,7 +377,7 @@ const gatherTests = [
             43.84803771972656, 48.81806945800781, 10.829925537109375,
             -19.693084716796875
           ],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         }
       }
     }
@@ -397,11 +397,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [4, 8, 9, 10],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -417,7 +417,7 @@ const gatherTests = [
             -19.693084716796875, -37.696800231933594, 43.11057662963867,
             0.9129875898361206, -7.699817180633545
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -437,11 +437,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [8, 2, 2, 3, 4, 1, 2, 2, 7, 11, 4, 11, 6, 6, 7, 3, 11, 10],
-          'descriptor': {'dimensions': [2, 3, 3], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 3, 3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -466,7 +466,7 @@ const gatherTests = [
             43.84803771972656,  48.81806945800781,   25.76774024963379,
             73.60064697265625,  0.9129875898361206,  -7.699817180633545
           ],
-          'descriptor': {'dimensions': [2, 3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -486,11 +486,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [6, 9, 7, 3, 4, 7, 4, 3, 7, 7, 6, 0],
-          'descriptor': {'dimensions': [1, 2, 2, 3], 'dataType': 'int64'},
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -511,7 +511,7 @@ const gatherTests = [
             44.92119598388672,  56.828636169433594, 90.2870101928711,
             55.620765686035156, -66.05901336669922, -68.9197006225586
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -531,11 +531,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [3, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [2, 1, 1, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -559,7 +559,7 @@ const gatherTests = [
             -50.42131042480469,  90.2870101928711,    55.620765686035156,
             44.92119598388672,   56.828636169433594
           ],
-          'descriptor': {'dimensions': [2, 2, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 4, 2], dataType: 'float32'}
         }
       }
     }
@@ -579,11 +579,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [8, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 1, 1, 3], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [0, 0, 7, 4],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -600,7 +600,7 @@ const gatherTests = [
             -7.699817180633545, 25.76774024963379, 73.60064697265625,
             90.2870101928711, 55.620765686035156, 44.92119598388672
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -620,11 +620,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [4, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 1, 1, 3], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [3, 2, 2],
-          'descriptor': {'dimensions': [3], 'dataType': 'int64'},
+          'descriptor': {shape: [3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -643,7 +643,7 @@ const gatherTests = [
             90.2870101928711, 55.620765686035156, 44.92119598388672,
             56.828636169433594, 10.829925537109375, -19.693084716796875
           ],
-          'descriptor': {'dimensions': [3, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -663,11 +663,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [3, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [1, 1, 2],
-          'descriptor': {'dimensions': [3], 'dataType': 'int64'},
+          'descriptor': {shape: [3], dataType: 'int64'},
           'constant': true
         }
       },
@@ -689,7 +689,7 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867, -37.696800231933594,
             43.11057662963867, 0.9129875898361206, -7.699817180633545
           ],
-          'descriptor': {'dimensions': [3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -709,11 +709,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [3, 4, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [0, 0, 0, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -745,7 +745,7 @@ const gatherTests = [
             0.9129875898361206,  -7.699817180633545,  25.76774024963379,
             25.76774024963379,   25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [3, 4, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -765,11 +765,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [8, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 1, 1, 3], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [0, 0, 7, 4],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int64'},
+          'descriptor': {shape: [2, 2], dataType: 'int64'},
           'constant': true
         }
       },
@@ -789,7 +789,7 @@ const gatherTests = [
             -7.699817180633545, 25.76774024963379, 73.60064697265625,
             90.2870101928711, 55.620765686035156, 44.92119598388672
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -809,11 +809,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [4, 2, 1, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 1, 1, 3], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [1],
-          'descriptor': {'dimensions': [], 'dataType': 'int64'},
+          'descriptor': {shape: [], dataType: 'int64'},
           'constant': true
         }
       },
@@ -832,7 +832,7 @@ const gatherTests = [
             -1.1303654909133911, 55.620765686035156, 10.829925537109375,
             43.11057662963867, 25.76774024963379
           ],
-          'descriptor': {'dimensions': [4, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -853,11 +853,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [-2],
-          'descriptor': {'dimensions': [], 'dataType': 'int32'},
+          'descriptor': {shape: [], dataType: 'int32'},
           'constant': true
         }
       },
@@ -874,7 +874,7 @@ const gatherTests = [
             43.84803771972656, 48.81806945800781, 51.79948425292969,
             41.94132614135742, -1.1303654909133911, -50.42131042480469
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       }
     }
@@ -895,11 +895,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [10],
-          'descriptor': {'dimensions': [], 'dataType': 'int32'},
+          'descriptor': {shape: [], dataType: 'int32'},
           'constant': true
         }
       },
@@ -916,7 +916,7 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867, 0.9129875898361206,
             -7.699817180633545, 25.76774024963379, 73.60064697265625
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       }
     }
@@ -937,11 +937,11 @@ const gatherTests = [
             -37.696800231933594, 43.11057662963867,   0.9129875898361206,
             -7.699817180633545,  25.76774024963379,   73.60064697265625
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12], dataType: 'float32'}
         },
         'gatherIndices': {
           'data': [-10],
-          'descriptor': {'dimensions': [], 'dataType': 'int32'},
+          'descriptor': {shape: [], dataType: 'int32'},
           'constant': true
         }
       },
@@ -958,7 +958,7 @@ const gatherTests = [
             43.84803771972656, 48.81806945800781, 51.79948425292969,
             41.94132614135742, -1.1303654909133911, -50.42131042480469
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/gatherElements.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gatherElements.https.any.js
index 6545375bf2b..ed08346e392 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gatherElements.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gatherElements.https.any.js
@@ -35,11 +35,11 @@ const gatherElementsTests = [
             -26.158037185668945, 89.0337142944336, -45.89653396606445,
             43.84803771972656, 48.81806945800781, 51.79948425292969
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
         },
         'gatherElementsIndices': {
           'data': [1, 0, 2, 2, 1, 0],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'uint32'},
+          'descriptor': {shape: [3, 2], dataType: 'uint32'},
           'constant': true
         }
       },
@@ -57,7 +57,7 @@ const gatherElementsTests = [
             -68.9197006225586, -66.05901336669922, -45.89653396606445,
             -45.89653396606445, 48.81806945800781, 43.84803771972656
           ],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         }
       }
     }
@@ -72,11 +72,11 @@ const gatherElementsTests = [
             -26.158037185668945, 89.0337142944336, -45.89653396606445,
             43.84803771972656, 48.81806945800781
           ],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         },
         'gatherElementsIndices': {
           'data': [-1, 0, 0, -1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'int32'},
+          'descriptor': {shape: [1, 2, 2], dataType: 'int32'},
           'constant': true
         }
       },
@@ -93,7 +93,7 @@ const gatherElementsTests = [
             89.0337142944336, -68.9197006225586, -77.02045440673828,
             48.81806945800781
           ],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -107,11 +107,11 @@ const gatherElementsTests = [
             -26.158037185668945, 89.0337142944336, -45.89653396606445,
             43.84803771972656, 48.81806945800781, 51.79948425292969
           ],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         },
         'gatherElementsIndices': {
           'data': [7],
-          'descriptor': {'dimensions': [1], 'dataType': 'uint32'},
+          'descriptor': {shape: [1], dataType: 'uint32'},
           'constant': true
         }
       },
@@ -125,7 +125,7 @@ const gatherElementsTests = [
       'expectedOutputs': {
         'gatherElementsOutput': {
           'data': [51.79948425292969],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/gatherND.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gatherND.https.any.js
new file mode 100644
index 00000000000..e8f31d5617b
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/gatherND.https.any.js
@@ -0,0 +1,182 @@
+// META: title=test WebNN API gatherND operation
+// META: global=window,dedicatedworker
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://www.w3.org/TR/webnn/#api-mlgraphbuilder-gatherND
+// Gather values of the input tensor along a range of dimensions according to
+// the indices.
+//
+// MLOperand gatherND(
+//     MLOperand input, MLOperand indices,
+//     optional MLOperatorOptions options = {});
+
+
+const getGatherNDPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 0};
+};
+
+const gatherNDTests = [
+  {
+    'name': 'gatherND float32 3D input and 2D indices',
+    'graph': {
+      'inputs': {
+        'gatherNDInput': {
+          'data': [
+            -66.05901336669922, -68.9197006225586, -77.02045440673828,
+            -26.158037185668945, 89.0337142944336, -45.89653396606445,
+            43.84803771972656, 48.81806945800781, 51.79948425292969,
+            41.94132614135742, -1.1303654909133911, -50.42131042480469,
+            90.2870101928711, 55.620765686035156, 44.92119598388672,
+            56.828636169433594
+          ],
+          'descriptor': {shape: [2, 2, 4], dataType: 'float32'}
+        },
+        'gatherNDIndices': {
+          'data': [1, 0, 0, 1, 1, 1],
+          'descriptor': {shape: [3, 2], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gatherND',
+        'arguments':
+            [{'input': 'gatherNDInput'}, {'indices': 'gatherNDIndices'}],
+        'outputs': 'gatherNDOutput'
+      }],
+      'expectedOutputs': {
+        'gatherNDOutput': {
+          'data': [
+            51.79948425292969, 41.94132614135742, -1.1303654909133911,
+            -50.42131042480469, 89.0337142944336, -45.89653396606445,
+            43.84803771972656, 48.81806945800781, 90.2870101928711,
+            55.620765686035156, 44.92119598388672, 56.828636169433594
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gatherND float32 4D input and 1D indices',
+    'graph': {
+      'inputs': {
+        'gatherNDInput': {
+          'data': [
+            -66.05901336669922, -68.9197006225586, -77.02045440673828,
+            -26.158037185668945, 89.0337142944336, -45.89653396606445,
+            43.84803771972656, 48.81806945800781, 51.79948425292969,
+            41.94132614135742, -1.1303654909133911, -50.42131042480469,
+            90.2870101928711, 55.620765686035156, 44.92119598388672,
+            56.828636169433594
+          ],
+          'descriptor': {shape: [2, 2, 2, 2], dataType: 'float32'}
+        },
+        'gatherNDIndices': {
+          'data': [1, 0, 0],
+          'descriptor': {shape: [3], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gatherND',
+        'arguments':
+            [{'input': 'gatherNDInput'}, {'indices': 'gatherNDIndices'}],
+        'outputs': 'gatherNDOutput'
+      }],
+      'expectedOutputs': {
+        'gatherNDOutput': {
+          'data': [51.79948425292969, 41.94132614135742],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gatherND float32 2D input and 2D negative indices',
+    'graph': {
+      'inputs': {
+        'gatherNDInput': {
+          'data': [
+            -66.05901336669922, -68.9197006225586, -77.02045440673828,
+            -26.158037185668945, 89.0337142944336, -45.89653396606445,
+            43.84803771972656, 48.81806945800781, 51.79948425292969,
+            41.94132614135742, -1.1303654909133911, -50.42131042480469,
+            90.2870101928711, 55.620765686035156, 44.92119598388672,
+            56.828636169433594
+          ],
+          'descriptor': {shape: [4, 4], dataType: 'float32'}
+        },
+        'gatherNDIndices': {
+          'data': [-1, -2, -3, -4],
+          'descriptor': {shape: [2, 2], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gatherND',
+        'arguments':
+            [{'input': 'gatherNDInput'}, {'indices': 'gatherNDIndices'}],
+        'outputs': 'gatherNDOutput'
+      }],
+      'expectedOutputs': {
+        'gatherNDOutput': {
+          'data': [44.92119598388672, 89.0337142944336],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    // TODO(crbug.com/366412395): Need to finalize the behavior of out-of-bounds
+    // indices. The result of this case is calculated by assuming the indices is
+    // being clamped.
+    'name': 'gatherND float32 1D input and 2D out-of-bounds indices',
+    'graph': {
+      'inputs': {
+        'gatherNDInput': {
+          'data': [
+            -66.05901336669922, -68.9197006225586, -77.02045440673828,
+            -26.158037185668945, 89.0337142944336, -45.89653396606445,
+            43.84803771972656, 48.81806945800781, 51.79948425292969,
+            41.94132614135742, -1.1303654909133911, -50.42131042480469,
+            90.2870101928711, 55.620765686035156, 44.92119598388672,
+            56.828636169433594
+          ],
+          'descriptor': {shape: [16], dataType: 'float32'}
+        },
+        'gatherNDIndices': {
+          'data': [16, 20],
+          'descriptor': {shape: [2, 1], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gatherND',
+        'arguments':
+            [{'input': 'gatherNDInput'}, {'indices': 'gatherNDIndices'}],
+        'outputs': 'gatherNDOutput'
+      }],
+      'expectedOutputs': {
+        'gatherNDOutput': {
+          'data': [56.828636169433594, 56.828636169433594],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  }
+];
+
+if (navigator.ml) {
+  gatherNDTests.forEach((test) => {
+    webnn_conformance_test(
+        buildGraphAndCompute, getGatherNDPrecisionTolerance, test);
+  });
+} else {
+  test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
+}
diff --git a/tests/wpt/tests/webnn/conformance_tests/gelu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gelu.https.any.js
index 446c5bc4eff..aa72bb65c83 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gelu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gelu.https.any.js
@@ -14,14 +14,6 @@
 //
 // MLOperand gelu(MLOperand input);
 
-
-const getGeluPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 18, float16: 18};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const geluTests = [
   {
     'name': 'gelu float32 0D scalar',
@@ -29,7 +21,7 @@ const geluTests = [
       'inputs': {
         'geluInput': {
           'data': [-0.044885843992233276],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -40,7 +32,7 @@ const geluTests = [
       'expectedOutputs': {
         'geluOutput': {
           'data': [-0.021639423444867134],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -51,7 +43,7 @@ const geluTests = [
       'inputs': {
         'geluInput': {
           'data': [-0.044891357421875],
-          'descriptor': {'dimensions': [], 'dataType': 'float16'}
+          'descriptor': {shape: [], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -62,7 +54,7 @@ const geluTests = [
       'expectedOutputs': {
         'geluOutput': {
           'data': [-0.021636962890625],
-          'descriptor': {'dimensions': [], 'dataType': 'float16'}
+          'descriptor': {shape: [], dataType: 'float16'}
         }
       }
     }
@@ -82,7 +74,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -102,7 +94,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -122,7 +114,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -143,7 +135,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -163,7 +155,7 @@ const geluTests = [
             -0.0989990234375, -0.8837890625,    -0.59619140625,
             0.318603515625,   0.4794921875,     -0.06488037109375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -183,7 +175,7 @@ const geluTests = [
             -0.04559326171875, -0.16650390625,     -0.164306640625,
             0.1990966796875,   0.328125,           -0.03076171875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'}
         }
       }
     }
@@ -203,7 +195,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -223,7 +215,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -243,7 +235,7 @@ const geluTests = [
             -0.0989990234375, -0.8837890625,    -0.59619140625,
             0.318603515625,   0.4794921875,     -0.06488037109375
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -263,7 +255,7 @@ const geluTests = [
             -0.04559326171875, -0.16650390625,     -0.164306640625,
             0.1990966796875,   0.328125,           -0.03076171875
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float16'}
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
         }
       }
     }
@@ -283,7 +275,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -303,7 +295,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -323,7 +315,7 @@ const geluTests = [
             -0.0989990234375, -0.8837890625,    -0.59619140625,
             0.318603515625,   0.4794921875,     -0.06488037109375
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -343,7 +335,7 @@ const geluTests = [
             -0.04559326171875, -0.16650390625,     -0.164306640625,
             0.1990966796875,   0.328125,           -0.03076171875
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
         }
       }
     }
@@ -363,7 +355,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -383,7 +375,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -403,7 +395,7 @@ const geluTests = [
             -0.0989990234375, -0.8837890625,    -0.59619140625,
             0.318603515625,   0.4794921875,     -0.06488037109375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -423,7 +415,7 @@ const geluTests = [
             -0.04559326171875, -0.16650390625,     -0.164306640625,
             0.1990966796875,   0.328125,           -0.03076171875
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
         }
       }
     }
@@ -443,7 +435,7 @@ const geluTests = [
             -0.09901237487792969, -0.8838679790496826,  -0.596120297908783,
             0.31863871216773987,  0.4794037640094757,   -0.06489315629005432
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -463,7 +455,7 @@ const geluTests = [
             -0.04560155048966408, -0.1665063202381134,  -0.1642593890428543,
             0.19914908707141876,  0.3279957175254822,   -0.030767757445573807
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -483,7 +475,7 @@ const geluTests = [
             -0.0989990234375, -0.8837890625,    -0.59619140625,
             0.318603515625,   0.4794921875,     -0.06488037109375
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -503,7 +495,7 @@ const geluTests = [
             -0.04559326171875, -0.16650390625,     -0.164306640625,
             0.1990966796875,   0.328125,           -0.03076171875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float16'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
         }
       }
     }
@@ -512,8 +504,7 @@ const geluTests = [
 
 if (navigator.ml) {
   geluTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getGeluPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
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 70b2ecb5e1e..099486c7f58 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js
@@ -23,38 +23,6 @@
 // MLOperand gemm(
 //     MLOperand a, MLOperand b, optional MLGemmOptions options = {});
 
-
-const getGemmPrecisionTolerance = (graphResources) => {
-  // GEMM : alpha * (A x B) + beta * C
-  // An upper bound for the worst serial ordering is bounded by
-  // the number of lossy operations, where matrix multiplication
-  // is a dot product (mul and add times the number of elements)
-  // plus bias operations.
-  const args = graphResources.operators[0].arguments;
-  const shapeA = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                     .descriptor.dimensions;
-  const options =
-      args.length === 3 ? {...args[2][Object.keys(args[2])[0]]} : {};
-  const width = options.aTranspose ? shapeA[0] : shapeA[1];
-  let tolerance = width * 2;
-  // default options.alpha is 1.0
-  if (options.alpha !== undefined && options.alpha !== 1.0) {
-    tolerance++;
-  }
-  if (options.c && options.beta !== 0.0) {
-    // default options.beta is 1.0
-    if (options.beta !== undefined && options.beta !== 1.0) {
-      tolerance++;
-    }
-    tolerance++;
-  }
-
-  const toleranceValueDict = {float32: tolerance, float16: tolerance};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const gemmTests = [
   {
     'name': 'gemm two float32 2D tensors (b is non-constant) default options',
@@ -67,7 +35,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -79,7 +47,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -96,7 +64,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -112,7 +80,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -124,7 +92,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -142,7 +110,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -158,7 +126,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 4], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -171,7 +139,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -182,7 +150,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -200,7 +168,7 @@ const gemmTests = [
             15122.8896484375, 18303.658203125, 5586.16064453125, 9266.43359375,
             9195.7294921875, 6438.0244140625, 10939.8330078125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -216,7 +184,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -228,7 +196,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -239,7 +207,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -257,7 +225,7 @@ const gemmTests = [
             15122.8896484375, 18303.658203125, 5586.16064453125, 9266.43359375,
             9195.7294921875, 6438.0244140625, 10939.8330078125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -273,7 +241,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -285,7 +253,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -293,7 +261,7 @@ const gemmTests = [
             85.90813446044922, 39.3753547668457, 50.942604064941406,
             31.87430763244629, 31.210525512695312
           ],
-          'descriptor': {'dimensions': [1, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -311,7 +279,7 @@ const gemmTests = [
             15066.1513671875, 18304.291015625, 5602.5986328125, 9298.642578125,
             9218.3349609375, 6379.20458984375, 10899.8125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -327,7 +295,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -339,12 +307,12 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
           'data': [6.20251989364624, 81.40641784667969, 73.00516510009766],
-          'descriptor': {'dimensions': [3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -362,7 +330,7 @@ const gemmTests = [
             15115.68359375, 18354.486328125, 5589.6953125, 9332.2724609375,
             9240.3974609375, 6420.33544921875, 10941.607421875
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -378,7 +346,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -390,12 +358,12 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
           'data': [18.78192901611328],
-          'descriptor': {'dimensions': [1, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -413,7 +381,7 @@ const gemmTests = [
             19144.529296875, 15053.0595703125, 18291.86328125, 5535.47216796875,
             9278.048828125, 9186.173828125, 6366.1123046875, 10887.384765625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -429,7 +397,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -441,7 +409,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -449,7 +417,7 @@ const gemmTests = [
             85.90813446044922, 39.3753547668457, 50.942604064941406,
             31.87430763244629, 31.210525512695312
           ],
-          'descriptor': {'dimensions': [5], 'dataType': 'float32'},
+          'descriptor': {shape: [5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -467,7 +435,7 @@ const gemmTests = [
             15066.1513671875, 18304.291015625, 5602.5986328125, 9298.642578125,
             9218.3349609375, 6379.20458984375, 10899.8125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -483,7 +451,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -495,12 +463,12 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
           'data': [18.78192901611328],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -518,7 +486,7 @@ const gemmTests = [
             19144.529296875, 15053.0595703125, 18291.86328125, 5535.47216796875,
             9278.048828125, 9186.173828125, 6366.1123046875, 10887.384765625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -534,7 +502,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -546,12 +514,12 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
           'data': [18.78192901611328],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -569,7 +537,7 @@ const gemmTests = [
             19144.529296875, 15053.0595703125, 18291.86328125, 5535.47216796875,
             9278.048828125, 9186.173828125, 6366.1123046875, 10887.384765625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -585,7 +553,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -597,7 +565,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -616,7 +584,7 @@ const gemmTests = [
             885183.875, 1091172, 1423568.5, 1119032, 1360102.75, 410618.53125,
             689186.1875, 682347.75, 472444.78125, 808972.3125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -632,7 +600,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -644,7 +612,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -665,7 +633,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -681,7 +649,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -693,7 +661,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -704,7 +672,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -724,7 +692,7 @@ const gemmTests = [
             20529.83984375, 20169.443359375, 9825.138671875, 9703.7041015625,
             10924.810546875, 11972.0244140625, 15286.1806640625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -740,7 +708,7 @@ const gemmTests = [
             59.638519287109375, 98.89488220214844, 50.76741409301758,
             36.271873474121094, 91.46013641357422, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -752,7 +720,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -772,7 +740,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -789,7 +757,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -801,7 +769,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -821,7 +789,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -837,7 +805,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -849,7 +817,7 @@ const gemmTests = [
             92.34209442138672,  61.32737731933594,     70.08265686035156,
             86.11856842041016,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [5, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [5, 4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -869,7 +837,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -886,7 +854,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -898,7 +866,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -918,7 +886,7 @@ const gemmTests = [
             5516.6904296875, 9259.267578125, 9167.3916015625, 6347.330078125,
             10868.6025390625
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -934,7 +902,7 @@ const gemmTests = [
             59.638519287109375, 98.89488220214844, 50.76741409301758,
             36.271873474121094, 91.46013641357422, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -946,7 +914,7 @@ const gemmTests = [
             92.34209442138672,  61.32737731933594,     70.08265686035156,
             86.11856842041016,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [5, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [5, 4], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -957,7 +925,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -983,7 +951,7 @@ const gemmTests = [
             887367.0625, 1091999, 1426718.125, 1124527.625, 1361999.125, 414927,
             689630.625, 684105.1875, 478069.46875, 813389.875
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -999,7 +967,7 @@ const gemmTests = [
             -76.046630859375, -83.94807434082031, -95.02689361572266,
             -47.89733123779297, -69.0116195678711, -86.66899108886719
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -1011,7 +979,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -1022,7 +990,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1041,7 +1009,7 @@ const gemmTests = [
             228076.8125, 277543.625, 378076, 241282.15625, 316800.71875,
             256391.5625, 378711.34375, 465195.8125, 341034.875, 460338.3125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -1057,7 +1025,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -1069,7 +1037,7 @@ const gemmTests = [
             -26.2825927734375,  -56.237979888916016, -46.47404861450195,
             -89.20684051513672, -53.495323181152344
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -1080,7 +1048,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1100,7 +1068,7 @@ const gemmTests = [
             235557.03125, 245540.5625, 170154.125, 309239.4375, 163583.015625,
             120958.7578125
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -1117,7 +1085,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -1129,7 +1097,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -1140,7 +1108,7 @@ const gemmTests = [
             -66.76168060302734, -25.392492294311523, -65.62987518310547,
             -40.50155258178711, -81.5303955078125, -41.39629364013672
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1161,7 +1129,7 @@ const gemmTests = [
             10026.1669921875, 9640.6611328125, 7300.03076171875,
             11352.3271484375
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -1177,7 +1145,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -1189,7 +1157,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -1200,7 +1168,7 @@ const gemmTests = [
             30.577470779418945, 69.47061920166016, 7.166217803955078,
             28.337108612060547, 90.69412231445312, 71.23025512695312
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1225,7 +1193,7 @@ const gemmTests = [
             -340977.71875, -413532.65625, -125550.484375, -209446.40625,
             -207616.390625, -144580.21875, -246583.921875
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -1242,7 +1210,7 @@ const gemmTests = [
             98.89488220214844, 91.46013641357422, 50.51683807373047,
             40.45679473876953, 50.76741409301758, 9.336554527282715
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -1254,7 +1222,7 @@ const gemmTests = [
             42.90679168701172,  34.08055114746094, 87.37654876708984,
             92.34209442138672,  60.32209014892578
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 5], dataType: 'float32'},
           'constant': true
         },
         'inputC': {
@@ -1265,7 +1233,7 @@ const gemmTests = [
             -66.76168060302734, -25.392492294311523, -65.62987518310547,
             -40.50155258178711, -81.5303955078125, -41.39629364013672
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1285,7 +1253,7 @@ const gemmTests = [
             -124764.09375, -209428.296875, -207325.765625, -143601.96875,
             -245792.984375
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -1294,8 +1262,7 @@ const gemmTests = [
 
 if (navigator.ml) {
   gemmTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getGemmPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/greater.https.any.js b/tests/wpt/tests/webnn/conformance_tests/greater.https.any.js
index e9a63b1682a..7017d0860d5 100644
--- a/tests/wpt/tests/webnn/conformance_tests/greater.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/greater.https.any.js
@@ -28,11 +28,11 @@ const greaterTests = [
       'inputs': {
         'inputA': {
           'data': [3.6851015090942383],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [1.723199725151062],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -41,8 +41,7 @@ const greaterTests = [
         'outputs': 'output'
       }],
       'expectedOutputs': {
-        'output':
-            {'data': [1], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+        'output': {'data': [1], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -61,7 +60,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -75,7 +74,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -90,7 +89,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -110,7 +109,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -123,7 +122,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -137,7 +136,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -157,7 +156,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -170,7 +169,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -184,7 +183,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -204,7 +203,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -217,7 +216,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -231,7 +230,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -251,7 +250,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -264,7 +263,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -278,7 +277,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -298,7 +297,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -311,7 +310,7 @@ const greaterTests = [
             4.982365131378174,  -2.507319211959839,  -4.518013954162598,
             8.351094245910645,  -6.161073207855225,  0.7364829182624817
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -325,7 +324,7 @@ const greaterTests = [
             1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,
             1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -336,7 +335,7 @@ const greaterTests = [
       'inputs': {
         'inputA': {
           'data': [6.2216410636901855],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -349,7 +348,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -363,7 +362,7 @@ const greaterTests = [
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
             0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -374,7 +373,7 @@ const greaterTests = [
       'inputs': {
         'inputA': {
           'data': [6.2216410636901855],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -387,7 +386,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -401,7 +400,7 @@ const greaterTests = [
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
             0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -421,14 +420,14 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -2.684664487838745, 6.170023441314697, 9.487744331359863,
             -2.5556411743164062, -2.0436434745788574, 8.533930778503418
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -442,7 +441,7 @@ const greaterTests = [
             0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0,
             1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -462,14 +461,14 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -7.099076271057129, -7.781408309936523, 8.782817840576172,
             -8.948624610900879
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -483,7 +482,7 @@ const greaterTests = [
             1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1,
             1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -494,7 +493,7 @@ const greaterTests = [
       'inputs': {
         'inputA': {
           'data': [6.2216410636901855],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -507,7 +506,7 @@ const greaterTests = [
             0.7069857120513916,  2.7764203548431396,  0.978833794593811,
             -6.254901885986328,  4.409034729003906,   -6.775286674499512
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -521,7 +520,7 @@ const greaterTests = [
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
             0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/greater_or_equal.https.any.js b/tests/wpt/tests/webnn/conformance_tests/greater_or_equal.https.any.js
index 2f2f572eba3..36cb9900ae4 100644
--- a/tests/wpt/tests/webnn/conformance_tests/greater_or_equal.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/greater_or_equal.https.any.js
@@ -29,11 +29,11 @@ const greaterOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [0.2829853594303131],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [6.156983375549316],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -42,8 +42,7 @@ const greaterOrEqualTests = [
         'outputs': 'output'
       }],
       'expectedOutputs': {
-        'output':
-            {'data': [0], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+        'output': {'data': [0], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -62,7 +61,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -76,7 +75,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -91,7 +90,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -111,7 +110,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -124,7 +123,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -138,7 +137,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -158,7 +157,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -171,7 +170,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -185,7 +184,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -205,7 +204,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -218,7 +217,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -232,7 +231,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -252,7 +251,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -265,7 +264,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -279,7 +278,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -299,7 +298,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -312,7 +311,7 @@ const greaterOrEqualTests = [
             8.678308486938477,   -9.449530601501465, 0.7702168822288513,
             -1.5186073780059814, -9.153943061828613, -4.991735935211182
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -326,7 +325,7 @@ const greaterOrEqualTests = [
             0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -337,7 +336,7 @@ const greaterOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [-1.0187573432922363],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -350,7 +349,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -364,7 +363,7 @@ const greaterOrEqualTests = [
             1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1,
             0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -375,7 +374,7 @@ const greaterOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [-1.0187573432922363],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -388,7 +387,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -402,7 +401,7 @@ const greaterOrEqualTests = [
             1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1,
             0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -422,14 +421,14 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -4.19451379776001, 3.8917839527130127, -3.5139973163604736,
             6.279316425323486, 0.001788170775398612, -0.7928582429885864
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -443,7 +442,7 @@ const greaterOrEqualTests = [
             0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0,
             1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -463,14 +462,14 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -3.2823047637939453, -1.3975636959075928, 0.49053606390953064,
             -6.882648944854736
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -484,7 +483,7 @@ const greaterOrEqualTests = [
             0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1,
             1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -495,7 +494,7 @@ const greaterOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [-1.0187573432922363],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -508,7 +507,7 @@ const greaterOrEqualTests = [
             5.782289028167725,   1.8712012767791748, -0.5233999490737915,
             0.43433287739753723, 8.93836498260498,   1.6568396091461182
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -522,7 +521,7 @@ const greaterOrEqualTests = [
             1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1,
             0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/gru.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gru.https.any.js
index 15f585ba914..4a144cce848 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gru.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gru.https.any.js
@@ -66,14 +66,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -82,15 +82,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -113,7 +113,7 @@ const gruTests = [
         'gruOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -125,14 +125,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -141,15 +141,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -173,7 +173,7 @@ const gruTests = [
         'gruOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -185,14 +185,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -201,15 +201,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -233,7 +233,7 @@ const gruTests = [
         'gruOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -245,14 +245,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -261,15 +261,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 1, 1, 1, 1, 2, 1, 2, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 1, 1, 1, 1, 2, 1, 2, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -293,7 +293,7 @@ const gruTests = [
         'gruOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -305,14 +305,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -321,19 +321,19 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruInitialHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -357,7 +357,7 @@ const gruTests = [
         'gruOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -368,14 +368,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [1, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -384,19 +384,19 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruInitialHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -423,12 +423,12 @@ const gruTests = [
         'gruOutput1': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         },
         'gruOutput2': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [1, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -440,14 +440,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1, 3, 4, 1, 2, 1, 1],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -456,15 +456,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -492,7 +492,7 @@ const gruTests = [
             -1.1589999198913575, -9.476999282836914, -1.1589999198913575,
             -11.319169044494629
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -504,14 +504,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1, 3, 4, 1, 2, 1, 1],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -520,15 +520,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -557,7 +557,7 @@ const gruTests = [
             -1.1589999198913575, -9.476999282836914, -1.1589999198913575,
             -11.319169044494629
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -569,14 +569,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1, 3, 4, 1, 2, 1, 1],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -585,15 +585,15 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
       },
       'operators': [{
@@ -622,7 +622,7 @@ const gruTests = [
             -1.1589999198913575, -9.476999282836914, -1.1589999198913575,
             -11.319169044494629
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         },
         'gruOutput2': {
           'data': [
@@ -651,7 +651,7 @@ const gruTests = [
             -1,
             -3.4100000858306886
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -662,14 +662,14 @@ const gruTests = [
       'inputs': {
         'gruInput': {
           'data': [1, 2, 2, 1, 1, 1, 3, 4, 1, 2, 1, 1],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         },
         'gruWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 2], dataType: 'float32'}
         },
         'gruRecurrentWeight': {
           'data': [
@@ -678,19 +678,19 @@ const gruTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [1, 12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12, 4], dataType: 'float32'}
         },
         'gruBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [1, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 12], dataType: 'float32'}
         },
         'gruInitialHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -721,7 +721,7 @@ const gruTests = [
             -1.1589999198913575, -9.476999282836914, -1.1589999198913575,
             -11.319169044494629
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         },
         'gruOutput2': {
           'data': [
@@ -750,7 +750,7 @@ const gruTests = [
             -1,
             -3.4100000858306886
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/gru_cell.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gru_cell.https.any.js
index 3d7e69fb9fb..6155a37490d 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gru_cell.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gru_cell.https.any.js
@@ -57,14 +57,14 @@ const gruCellTests = [
       'inputs': {
         'gruCellInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'gruCellWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gruCellRecurrentWeight': {
           'data': [
@@ -73,19 +73,19 @@ const gruCellTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 4], dataType: 'float32'}
         },
         'gruCellHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'gruCellBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         },
         'gruCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -108,7 +108,7 @@ const gruCellTests = [
         'gruCellOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         }
       }
     }
@@ -120,14 +120,14 @@ const gruCellTests = [
       'inputs': {
         'gruCellInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'gruCellWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gruCellRecurrentWeight': {
           'data': [
@@ -136,19 +136,19 @@ const gruCellTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
           ],
-          'descriptor': {'dimensions': [12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 4], dataType: 'float32'}
         },
         'gruCellHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'gruCellBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         },
         'gruCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -172,7 +172,7 @@ const gruCellTests = [
         'gruCellOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         }
       }
     }
@@ -184,14 +184,14 @@ const gruCellTests = [
       'inputs': {
         'gruCellInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'gruCellWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gruCellRecurrentWeight': {
           'data': [
@@ -200,19 +200,19 @@ const gruCellTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
           ],
-          'descriptor': {'dimensions': [12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 4], dataType: 'float32'}
         },
         'gruCellHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'gruCellBias': {
           'data': [1, 1, 1, 1, 1, 2, 1, 2, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         },
         'gruCellRecurrentBias': {
           'data': [1, 1, 1, 1, 1, 2, 1, 2, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -236,7 +236,7 @@ const gruCellTests = [
         'gruCellOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         }
       }
     }
@@ -247,14 +247,14 @@ const gruCellTests = [
       'inputs': {
         'gruCellInput': {
           'data': [1, 2, 2, 1, 1, 1],
-          'descriptor': {'dimensions': [3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
         },
         'gruCellWeight': {
           'data': [
             1,   -1,   2, -2,  0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,
             0.5, -0.5, 0, 0.1, 1,   -1,   2, -2,  0.5, -0.5, 0, 0.1
           ],
-          'descriptor': {'dimensions': [12, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 2], dataType: 'float32'}
         },
         'gruCellRecurrentWeight': {
           'data': [
@@ -263,19 +263,19 @@ const gruCellTests = [
             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, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
           ],
-          'descriptor': {'dimensions': [12, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 4], dataType: 'float32'}
         },
         'gruCellHiddenState': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'gruCellBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         },
         'gruCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -299,7 +299,7 @@ const gruCellTests = [
         'gruCellOutput': {
           'data':
               [0, 0, -0.25, -3.84, -4, -15, -2.25, -3.41, -1, -3, -1, -3.41],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js b/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
index 4ab915958e1..af8c3918f3d 100644
--- a/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
@@ -20,14 +20,6 @@
 // MLOperand hardSigmoid(
 //     MLOperand input, optional MLHardSigmoidOptions options = {});
 
-
-const getHardSigmoidPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 2, float16: 2};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const hardSigmoidTests = [
   {
     'name': 'hardSigmoid float32 positive 0D tensor default options',
@@ -35,7 +27,7 @@ const hardSigmoidTests = [
       'inputs': {
         'hardSigmoidInput': {
           'data': [0.05907066911458969],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -46,7 +38,7 @@ const hardSigmoidTests = [
       'expectedOutputs': {
         'hardSigmoidOutput': {
           'data': [0.5118141174316406],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -66,7 +58,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -86,7 +78,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -106,7 +98,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -126,7 +118,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -146,7 +138,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -166,7 +158,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -186,7 +178,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -206,7 +198,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -226,7 +218,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -246,7 +238,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -266,7 +258,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -286,7 +278,7 @@ const hardSigmoidTests = [
             0.6462276577949524, 0.5976191759109497, 0.6553369164466858,
             0.669111430644989,  0.6110604405403137, 0.6120688915252686
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -307,7 +299,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -346,7 +338,7 @@ const hardSigmoidTests = [
             0.936147153377533,
             0.9401075839996338
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -367,7 +359,7 @@ const hardSigmoidTests = [
             -0.7311381697654724,  -0.4880960285663605, -0.7766845226287842,
             -0.8455570340156555,  -0.555302083492279,  -0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -406,7 +398,7 @@ const hardSigmoidTests = [
             0.936147153377533,
             0.9401075839996338
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -427,7 +419,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -450,7 +442,7 @@ const hardSigmoidTests = [
             0.5824136734008789, 0.533805251121521,  0.5915229320526123,
             0.6052974462509155, 0.5472464561462402, 0.5482549667358398
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -471,7 +463,7 @@ const hardSigmoidTests = [
             -0.7311381697654724,  -0.4880960285663605, -0.7766845226287842,
             -0.8455570340156555,  -0.555302083492279,  -0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -488,7 +480,7 @@ const hardSigmoidTests = [
             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': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -509,7 +501,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -548,7 +540,7 @@ const hardSigmoidTests = [
             0.8723332285881042,
             0.8762935996055603
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -569,7 +561,7 @@ const hardSigmoidTests = [
             0.7311381697654724,  0.4880960285663605, 0.7766845226287842,
             0.8455570340156555,  0.555302083492279,  0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -588,7 +580,7 @@ const hardSigmoidTests = [
             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': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -609,7 +601,7 @@ const hardSigmoidTests = [
             -0.7311381697654724,  -0.4880960285663605, -0.7766845226287842,
             -0.8455570340156555,  -0.555302083492279,  -0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -628,7 +620,7 @@ const hardSigmoidTests = [
             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': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -649,7 +641,7 @@ const hardSigmoidTests = [
             -0.7311381697654724,  -0.4880960285663605, -0.7766845226287842,
             -0.8455570340156555,  -0.555302083492279,  -0.5603444576263428
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -690,7 +682,7 @@ const hardSigmoidTests = [
             0.8723332285881042,
             0.8762935996055603
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -699,8 +691,7 @@ const hardSigmoidTests = [
 
 if (navigator.ml) {
   hardSigmoidTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getHardSigmoidPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js b/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
index 480b696d77f..e9c341b7707 100644
--- a/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
@@ -14,14 +14,6 @@
 //
 // MLOperand hardSwish(MLOperand input);
 
-
-const getHardSwishPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 4, float16: 4};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const hardSwishTests = [
   {
     'name': 'hardSwish float32 0D tensor',
@@ -29,7 +21,7 @@ const hardSwishTests = [
       'inputs': {
         'hardSwishInput': {
           'data': [0.7341583371162415],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -40,7 +32,7 @@ const hardSwishTests = [
       'expectedOutputs': {
         'hardSwishOutput': {
           'data': [0.4569105803966522],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -60,7 +52,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -97,7 +89,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -117,7 +109,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -153,7 +145,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -173,7 +165,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -209,7 +201,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -229,7 +221,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -265,7 +257,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -285,7 +277,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -321,7 +313,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -341,7 +333,7 @@ const hardSwishTests = [
             3.7802627086639404,  -6.071240425109863,  -9.909919738769531,
             -7.744259357452393,  -8.286120414733887,  8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -377,7 +369,7 @@ const hardSwishTests = [
             0,
             8.083491325378418
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -386,8 +378,7 @@ const hardSwishTests = [
 
 if (navigator.ml) {
   hardSwishTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getHardSwishPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/identity.https.any.js b/tests/wpt/tests/webnn/conformance_tests/identity.https.any.js
index ca4239145b1..6e1b1e7f6db 100644
--- a/tests/wpt/tests/webnn/conformance_tests/identity.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/identity.https.any.js
@@ -28,7 +28,7 @@ const identityTests = [
       'inputs': {
         'identityInput': {
           'data': [-4.273642539978027],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const identityTests = [
       'expectedOutputs': {
         'identityOutput': {
           'data': [-4.273642539978027],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const identityTests = [
             -9.782458305358887,  5.496699810028076,   -9.967339515686035,
             -6.901016712188721,  -2.8501904010772705, 3.279616355895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/inputs-are-not-modified.https.any.js b/tests/wpt/tests/webnn/conformance_tests/inputs-are-not-modified.https.any.js
index f3a1d14fd53..ffd2d93a557 100644
--- a/tests/wpt/tests/webnn/conformance_tests/inputs-are-not-modified.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/inputs-are-not-modified.https.any.js
@@ -21,7 +21,7 @@ promise_setup(async () => {
 promise_test(async () => {
   const builder = new MLGraphBuilder(mlContext);
   const inputOperand =
-      builder.input('input', {dataType: 'float32', dimensions: [4]});
+      builder.input('input', {dataType: 'float32', shape: [4]});
   const hardSwishOperand = builder.hardSwish(inputOperand);
   // Add some other operator for the output tensor to bind to; otherwise there
   // is no reason to implement hardSwish "in-place".
@@ -30,11 +30,11 @@ promise_test(async () => {
   const [inputTensor, outputTensor, mlGraph] = await Promise.all([
     mlContext.createTensor({
       dataType: 'float32',
-      dimensions: [4],
+      shape: [4],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ
     }),
     mlContext.createTensor(
-        {dataType: 'float32', dimensions: [4], usage: MLTensorUsage.READ}),
+        {dataType: 'float32', shape: [4], usage: MLTensorUsage.READ}),
     builder.build({'output': outputOperand})
   ]);
 
@@ -54,9 +54,9 @@ promise_test(async () => {
 promise_test(async () => {
   const builder = new MLGraphBuilder(mlContext);
   const inputOperand =
-      builder.input('input', {dataType: 'float32', dimensions: [4]});
+      builder.input('input', {dataType: 'float32', shape: [4]});
   const constantOperand = builder.constant(
-      {dataType: 'float32', dimensions: [4]}, Float32Array.from([-2, 0, 3, 4]));
+      {dataType: 'float32', shape: [4]}, Float32Array.from([-2, 0, 3, 4]));
   const mulOperand = builder.mul(inputOperand, constantOperand);
   // Add some other operator for the output tensor to bind to; otherwise there
   // is no reason to implement mul "in-place".
@@ -65,11 +65,11 @@ promise_test(async () => {
   const [inputTensor, outputTensor, mlGraph] = await Promise.all([
     mlContext.createTensor({
       dataType: 'float32',
-      dimensions: [4],
+      shape: [4],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ
     }),
     mlContext.createTensor(
-        {dataType: 'float32', dimensions: [4], usage: MLTensorUsage.READ}),
+        {dataType: 'float32', shape: [4], usage: MLTensorUsage.READ}),
     builder.build({'output': outputOperand})
   ]);
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
index 5790b20d8e8..46f434bd245 100644
--- a/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
@@ -47,7 +47,7 @@ const instanceNormTests = [
             -16.574905395507812, 42.949893951416016, 73.8739242553711,
             -99.00035095214844,  -33.11322784423828, -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -67,7 +67,7 @@ const instanceNormTests = [
             -1.6783342361450195, 0.46660327911376953, 1.5037200450897217,
             -1.2981476783752441, -0.2302791178226471, 0.024706769734621048
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -87,11 +87,11 @@ const instanceNormTests = [
             -16.574905395507812, 42.949893951416016, 73.8739242553711,
             -99.00035095214844,  -33.11322784423828, -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'instanceNormScale': {
           'data': [-94.42772674560547, 66.69620513916016, -98.56572723388672],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -115,7 +115,7 @@ const instanceNormTests = [
             -111.93852233886719, 31.120668411254883,  -148.2152557373047,
             127.95286560058594,  22.697628021240234,  -2.4352407455444336
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -135,11 +135,11 @@ const instanceNormTests = [
             -16.574905395507812, 42.949893951416016, 73.8739242553711,
             -99.00035095214844,  -33.11322784423828, -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         },
         'instanceNormBias': {
           'data': [-33.048641204833984, 4.511423587799072, -37.93617248535156],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -163,7 +163,7 @@ const instanceNormTests = [
             2.8330893516540527,  4.978026866912842,   -36.43245315551758,
             -39.23432159423828,  -38.16645050048828,  -37.91146469116211
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -183,7 +183,7 @@ const instanceNormTests = [
             -16.574905395507812, 42.949893951416016, 73.8739242553711,
             -99.00035095214844,  -33.11322784423828, -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -205,7 +205,7 @@ const instanceNormTests = [
             -1.6783342361450195, 0.46660327911376953, 1.5037200450897217,
             -1.2981476783752441, -0.2302791178226471, 0.024706769734621048
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -226,7 +226,7 @@ const instanceNormTests = [
             -16.574905395507812, 42.949893951416016, 73.8739242553711,
             -99.00035095214844,  -33.11322784423828, -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -247,7 +247,7 @@ const instanceNormTests = [
             -1.6783342361450195, 0.46660327911376953, 1.5037200450897217,
             -1.2981476783752441, -0.2302791178226471, 0.024706769734621048
           ],
-          'descriptor': {'dimensions': [2, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -267,7 +267,7 @@ const instanceNormTests = [
             5.6758809089660645, -16.574905395507812, -33.11322784423828,
             25.68659210205078,  42.949893951416016,  -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -288,7 +288,7 @@ const instanceNormTests = [
             -1.3059037923812866, -1.6783342361450195,  -0.2302791178226471,
             -0.6197298169136047, 0.46660327911376953,  0.024706769734621048
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -308,16 +308,16 @@ const instanceNormTests = [
             5.6758809089660645, -16.574905395507812, -33.11322784423828,
             25.68659210205078,  42.949893951416016,  -17.380685806274414
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'instanceNormScale': {
           'data': [-94.42772674560547, 66.69620513916016, -98.56572723388672],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         },
         'instanceNormBias': {
           'data': [-33.048641204833984, 4.511423587799072, -37.93617248535156],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -347,7 +347,7 @@ const instanceNormTests = [
             90.26488494873047,   -107.4271011352539,  -15.238543510437012,
             25.471038818359375,  35.6320915222168,    -40.37141418457031
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
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 84b90ca2779..23ba642e242 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
@@ -45,7 +45,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -65,7 +65,7 @@ const layerNormTests = [
             -1.795186161994934,   -0.6376377940177917, 1.1961140632629395,
             0.034106940031051636, 0.9297415614128113,  0.2728613615036011
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -85,7 +85,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -105,7 +105,7 @@ const layerNormTests = [
             -1.7796510457992554, -0.5852779150009155, 1.3068104982376099,
             0.10783683508634567, 1.0319640636444092,  0.35418668389320374
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -125,7 +125,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -145,7 +145,7 @@ const layerNormTests = [
             -1.7796510457992554, -0.5852779150009155, 1.3068104982376099,
             0.10783683508634567, 1.0319640636444092,  0.35418668389320374
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -165,7 +165,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -185,7 +185,7 @@ const layerNormTests = [
             -1.7796510457992554, -0.5852779150009155, 1.3068104982376099,
             0.10783683508634567, 1.0319640636444092,  0.35418668389320374
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -205,7 +205,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         },
         'layerNormScale': {
           'data': [
@@ -214,7 +214,7 @@ const layerNormTests = [
             7.1816911697387695, 1.5054303407669067, 3.120894193649292,
             0.5214731693267822, 2.6719748973846436, -3.571370840072632
           ],
-          'descriptor': {'dimensions': [1, 4, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 4, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -237,7 +237,7 @@ const layerNormTests = [
             -12.780903816223145, -0.8810951709747314, 4.0784173011779785,
             0.05623401328921318, 2.7573819160461426,  -1.2649319171905518
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -257,7 +257,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         },
         'layerNormBias': {
           'data': [
@@ -266,7 +266,7 @@ const layerNormTests = [
             -4.080942153930664, -7.137991905212402, 8.465653419494629,
             2.762545108795166, 0.8230442404747009, -3.827561378479004
           ],
-          'descriptor': {'dimensions': [1, 4, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 4, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -289,7 +289,7 @@ const layerNormTests = [
             -5.860593318939209,  -7.723269939422607,  9.77246379852295,
             2.8703818321228027,  1.8550082445144653,  -3.473374605178833
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -309,7 +309,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -329,7 +329,7 @@ const layerNormTests = [
             -1.0618212223052979,  -0.5766634941101074, 1.7181260585784912,
             0.539446234703064,    1.2323321104049683,  -0.5902572274208069
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -349,7 +349,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -370,7 +370,7 @@ const layerNormTests = [
             -1.7796509265899658, -0.5852779150009155, 1.3068104982376099,
             0.10783682763576508, 1.0319639444351196,  0.35418668389320374
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -391,7 +391,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         },
         'layerNormScale': {
           'data': [
@@ -399,7 +399,7 @@ const layerNormTests = [
             4.707905292510986, -4.705780029296875, -5.143046855926514,
             -1.1115549802780151, 5.250569820404053
           ],
-          'descriptor': {'dimensions': [2, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -423,7 +423,7 @@ const layerNormTests = [
             1.3962621688842773,  1.185346245765686,    -1.959165334701538,
             1.8479242324829102,  3.3530402183532715,   -3.986907958984375
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -444,7 +444,7 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         },
         'layerNormBias': {
           'data': [
@@ -453,7 +453,7 @@ const layerNormTests = [
             9.744950294494629, -0.3958968222141266, -8.497353553771973,
             6.172536849975586, -2.8930461406707764, 1.7220044136047363
           ],
-          'descriptor': {'dimensions': [3, 1, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [3, 1, 4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -477,7 +477,7 @@ const layerNormTests = [
             2.5836451053619385,  9.159672737121582,  -1.5862356424331665,
             8.967641830444336,   0.6360672116279602, 2.0761911869049072
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
@@ -497,14 +497,14 @@ const layerNormTests = [
             -88.03730773925781,  -26.5667724609375,   70.81292724609375,
             9.105611801147461,   56.66746139526367,   21.78444480895996
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         },
         'layerNormScale': {
           'data': [
             7.715926647186279, 1.7371079921722412, 9.13965129852295,
             5.758823394775391, -2.8198351860046387, -0.6866958141326904
           ],
-          'descriptor': {'dimensions': [2, 3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 1], dataType: 'float32'},
           'constant': true
         },
         'layerNormBias': {
@@ -512,7 +512,7 @@ const layerNormTests = [
             -8.710672378540039, -7.642981052398682, 4.937538146972656,
             -2.1876745223999023, -4.067612648010254, -6.836254596710205
           ],
-          'descriptor': {'dimensions': [2, 3, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -542,7 +542,7 @@ const layerNormTests = [
             -11.648612976074219, -2.117840528488159,  -7.396423816680908,
             -4.869131088256836,  -5.8111701011657715, -6.714934349060059
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
index f14489b1295..f49c2d02809 100644
--- a/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
@@ -20,14 +20,6 @@
 // MLOperand leakyRelu(
 //     MLOperand input, optional MLLeakyReluOptions options = {});
 
-
-const getLeakyReluPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 1, float16: 1};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const leakyReluTests = [
   {
     'name': 'leakyRelu float32 1D constant tensor default options',
@@ -44,7 +36,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -65,7 +57,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -76,7 +68,7 @@ const leakyReluTests = [
       'inputs': {
         'leakyReluInput': {
           'data': [-19.053640365600586],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -87,7 +79,7 @@ const leakyReluTests = [
       'expectedOutputs': {
         'leakyReluOutput': {
           'data': [-0.19053640961647034],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -107,7 +99,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -127,7 +119,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -147,7 +139,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -167,7 +159,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -187,7 +179,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -207,7 +199,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -227,7 +219,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -247,7 +239,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -267,7 +259,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -287,7 +279,7 @@ const leakyReluTests = [
             -0.6147925853729248,  64.26514434814453,    21.469341278076172,
             -0.31514689326286316, -0.4127694368362427,  -0.6559529304504395
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -307,7 +299,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -330,7 +322,7 @@ const leakyReluTests = [
             6006.5908203125,    64.26514434814453,  21.469341278076172,
             3079.019775390625,  4032.802490234375,  6408.73193359375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -350,7 +342,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -373,7 +365,7 @@ const leakyReluTests = [
             -2200.906005859375,  64.26514434814453,   21.469341278076172,
             -1128.1995849609375, -1477.6800537109375, -2348.256591796875
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -393,7 +385,7 @@ const leakyReluTests = [
             -61.47925567626953,  64.26514434814453,  21.469341278076172,
             -31.514690399169922, -41.27694320678711, -65.59529113769531
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -429,7 +421,7 @@ const leakyReluTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -438,8 +430,7 @@ const leakyReluTests = [
 
 if (navigator.ml) {
   leakyReluTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getLeakyReluPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/lesser.https.any.js b/tests/wpt/tests/webnn/conformance_tests/lesser.https.any.js
index f7200bc21d8..322209f18a1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/lesser.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/lesser.https.any.js
@@ -28,11 +28,11 @@ const lesserTests = [
       'inputs': {
         'inputA': {
           'data': [-0.5228080153465271],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [0.8150388598442078],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -41,8 +41,7 @@ const lesserTests = [
         'outputs': 'output'
       }],
       'expectedOutputs': {
-        'output':
-            {'data': [1], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+        'output': {'data': [1], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -61,7 +60,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -75,7 +74,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -90,7 +89,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -110,7 +109,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -123,7 +122,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -137,7 +136,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -157,7 +156,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -170,7 +169,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -184,7 +183,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -204,7 +203,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -217,7 +216,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -231,7 +230,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -251,7 +250,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -264,7 +263,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -278,7 +277,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -298,7 +297,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -311,7 +310,7 @@ const lesserTests = [
             -1.4069052934646606, -0.23742099106311798, -9.10597038269043,
             6.811779975891113,   -6.768326759338379,   -8.952353477478027
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -325,7 +324,7 @@ const lesserTests = [
             1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,
             1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -336,7 +335,7 @@ const lesserTests = [
       'inputs': {
         'inputA': {
           'data': [-5.678369998931885],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -349,7 +348,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -363,7 +362,7 @@ const lesserTests = [
             1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0,
             1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -374,7 +373,7 @@ const lesserTests = [
       'inputs': {
         'inputA': {
           'data': [-5.678369998931885],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -387,7 +386,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -401,7 +400,7 @@ const lesserTests = [
             1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0,
             1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -421,14 +420,14 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             3.5869946479797363, -2.853332042694092, -3.684652805328369,
             2.4055018424987793, -4.358371257781982, 5.5484747886657715
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -442,7 +441,7 @@ const lesserTests = [
             1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
             1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -462,14 +461,14 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -4.439523696899414, 2.7518322467803955, 3.635943651199341,
             -2.8089921474456787
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -483,7 +482,7 @@ const lesserTests = [
             0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
             0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -494,7 +493,7 @@ const lesserTests = [
       'inputs': {
         'inputA': {
           'data': [-5.678369998931885],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -507,7 +506,7 @@ const lesserTests = [
             1.0030865669250488,  -9.076244354248047,  8.907161712646484,
             4.232614994049072,   2.1005890369415283,  -6.201345443725586
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -521,7 +520,7 @@ const lesserTests = [
             1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0,
             1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/lesser_or_equal.https.any.js b/tests/wpt/tests/webnn/conformance_tests/lesser_or_equal.https.any.js
index fce69f61125..aceec9dc135 100644
--- a/tests/wpt/tests/webnn/conformance_tests/lesser_or_equal.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/lesser_or_equal.https.any.js
@@ -29,11 +29,11 @@ const lesserOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [-6.978766441345215],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [6.613064765930176],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -42,8 +42,7 @@ const lesserOrEqualTests = [
         'outputs': 'output'
       }],
       'expectedOutputs': {
-        'output':
-            {'data': [1], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+        'output': {'data': [1], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -62,7 +61,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -76,7 +75,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -91,7 +90,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -111,7 +110,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -124,7 +123,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -138,7 +137,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -158,7 +157,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -171,7 +170,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -185,7 +184,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -205,7 +204,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -218,7 +217,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -232,7 +231,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -252,7 +251,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -265,7 +264,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -279,7 +278,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -299,7 +298,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -312,7 +311,7 @@ const lesserOrEqualTests = [
             -2.5953285694122314,  -4.9998064041137695, 3.118950605392456,
             9.705141067504883,    9.54673957824707,    -6.189505577087402
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -326,7 +325,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -337,7 +336,7 @@ const lesserOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [4.840610980987549],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -350,7 +349,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -364,7 +363,7 @@ const lesserOrEqualTests = [
             0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -375,7 +374,7 @@ const lesserOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [4.840610980987549],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -388,7 +387,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -402,7 +401,7 @@ const lesserOrEqualTests = [
             0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -422,14 +421,14 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -8.499547004699707, -8.321310043334961, -7.182070732116699,
             3.418306350708008, 5.389469146728516, 6.904313087463379
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -443,7 +442,7 @@ const lesserOrEqualTests = [
             0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1,
             0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -463,14 +462,14 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             4.195140838623047, 7.8286590576171875, 6.6902031898498535,
             0.9247010350227356
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -484,7 +483,7 @@ const lesserOrEqualTests = [
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
             0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -495,7 +494,7 @@ const lesserOrEqualTests = [
       'inputs': {
         'inputA': {
           'data': [4.840610980987549],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -508,7 +507,7 @@ const lesserOrEqualTests = [
             1.64528226852417,   -1.4862726926803589, -4.998753547668457,
             -0.920993447303772, -9.434256553649902,  9.813238143920898
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -522,7 +521,7 @@ const lesserOrEqualTests = [
             0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
             1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/linear.https.any.js b/tests/wpt/tests/webnn/conformance_tests/linear.https.any.js
index da4115bcfa6..a959403aff4 100644
--- a/tests/wpt/tests/webnn/conformance_tests/linear.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/linear.https.any.js
@@ -18,14 +18,6 @@
 //
 // MLOperand linear(MLOperand input, optional MLLinearOptions options = {});
 
-
-const getLinearPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 2, float16: 2};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const linearTests = [
   {
     'name': 'linear float32 1D constant tensor default options',
@@ -42,7 +34,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -63,7 +55,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -74,7 +66,7 @@ const linearTests = [
       'inputs': {
         'linearInput': {
           'data': [-1.12251615524292],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -85,7 +77,7 @@ const linearTests = [
       'expectedOutputs': {
         'linearOutput': {
           'data': [-1.12251615524292],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -105,7 +97,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -125,7 +117,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -145,7 +137,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -165,7 +157,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -185,7 +177,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -205,7 +197,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -225,7 +217,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -245,7 +237,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -265,7 +257,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -285,7 +277,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -306,7 +298,7 @@ const linearTests = [
             5.2140889167785645,  9.65861701965332,   -8.721749305725098,
             -0.4533396363258362, 9.992619514465332,  -6.469675064086914
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -328,7 +320,7 @@ const linearTests = [
             38.57796859741211,   71.46211242675781,   -64.53042602539062,
             -3.3541665077209473, 73.9333267211914,    -47.86779022216797
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -349,7 +341,7 @@ const linearTests = [
             5.16057825088501,   0.8060914278030396,  9.130533218383789,
             3.1937403678894043, 5.748293399810791,   4.113487720489502
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -371,7 +363,7 @@ const linearTests = [
             11.079673767089844, 6.725186824798584,  15.049629211425781,
             9.112835884094238,  11.667388916015625, 10.032583236694336
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -392,7 +384,7 @@ const linearTests = [
             -5.16057825088501,   -0.8060914278030396,  -9.130533218383789,
             -3.1937403678894043, -5.748293399810791,   -4.113487720489502
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -414,7 +406,7 @@ const linearTests = [
             -11.079673767089844, -6.725186824798584,  -15.049629211425781,
             -9.112835884094238,  -11.667388916015625, -10.032583236694336
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -435,7 +427,7 @@ const linearTests = [
             5.16057825088501,   0.8060914278030396,  9.130533218383789,
             3.1937403678894043, 5.748293399810791,   4.113487720489502
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -458,7 +450,7 @@ const linearTests = [
             44.10115051269531,  11.883199691772461, 73.47402954101562,
             29.548921585083008, 48.44953155517578,  36.35394287109375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -479,7 +471,7 @@ const linearTests = [
             5.16057825088501,   0.8060914278030396,  9.130533218383789,
             3.1937403678894043, 5.748293399810791,   4.113487720489502
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -502,7 +494,7 @@ const linearTests = [
             -44.10115051269531,  -11.883199691772461, -73.47402954101562,
             -29.548921585083008, -48.44953155517578,  -36.35394287109375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -523,7 +515,7 @@ const linearTests = [
             -5.16057825088501,   -0.8060914278030396,  -9.130533218383789,
             -3.1937403678894043, -5.748293399810791,   -4.113487720489502
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -546,7 +538,7 @@ const linearTests = [
             -44.10115051269531,  -11.883199691772461, -73.47402954101562,
             -29.548921585083008, -48.44953155517578,  -36.35394287109375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -555,8 +547,7 @@ const linearTests = [
 
 if (navigator.ml) {
   linearTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getLinearPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/log.https.any.js b/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
index a8d5b006ebb..8d6b5885c28 100644
--- a/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
@@ -28,7 +28,7 @@ const logTests = [
       'inputs': {
         'logInput': {
           'data': [63.82542037963867],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const logTests = [
       'expectedOutputs': {
         'logOutput': {
           'data': [4.15615177154541],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const logTests = [
             30.385812759399414, 13.709558486938477, 10.396759986877441,
             50.840946197509766, 5.682034492492676,  94.02275848388672
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const logTests = [
             3.413975715637207,  2.618093252182007,  2.34149432182312,
             3.9287021160125732, 1.7373093366622925, 4.54353666305542
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/logical_not.https.any.js b/tests/wpt/tests/webnn/conformance_tests/logical_not.https.any.js
index 51db74cd3ae..e56c5626ef8 100644
--- a/tests/wpt/tests/webnn/conformance_tests/logical_not.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/logical_not.https.any.js
@@ -27,7 +27,7 @@ const logicalNotTests = [
     'graph': {
       'inputs': {
         'logicalNotInput':
-            {'data': [1], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+            {'data': [1], 'descriptor': {shape: [], dataType: 'uint8'}}
       },
       'operators': [{
         'name': 'logicalNot',
@@ -36,7 +36,7 @@ const logicalNotTests = [
       }],
       'expectedOutputs': {
         'logicalNotOutput':
-            {'data': [0], 'descriptor': {'dimensions': [], 'dataType': 'uint8'}}
+            {'data': [0], 'descriptor': {shape: [], dataType: 'uint8'}}
       }
     }
   },
@@ -49,7 +49,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'},
+          'descriptor': {shape: [24], dataType: 'uint8'},
           'constant': true
         }
       },
@@ -64,7 +64,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -78,7 +78,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -92,7 +92,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         }
       }
     }
@@ -106,7 +106,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         }
       }
     }
@@ -134,7 +134,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -148,7 +148,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         }
       }
     }
@@ -162,7 +162,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -176,7 +176,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         }
       }
     }
@@ -190,7 +190,7 @@ const logicalNotTests = [
             204, 130, 90, 0,   147, 42, 10,  18,  13,  235, 0,   233,
             53,  83,  9,  254, 69,  56, 219, 109, 171, 0,   228, 135
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'uint8'}
         }
       },
       'operators': [{
@@ -204,7 +204,7 @@ const logicalNotTests = [
             0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/lstm.https.any.js b/tests/wpt/tests/webnn/conformance_tests/lstm.https.any.js
index 8b6cf73715c..20198bfb2f5 100644
--- a/tests/wpt/tests/webnn/conformance_tests/lstm.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/lstm.https.any.js
@@ -66,26 +66,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -106,11 +106,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -122,30 +122,30 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -167,11 +167,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -183,30 +183,30 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmInitialHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -228,11 +228,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -244,30 +244,30 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmInitialCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -289,11 +289,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -305,26 +305,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -346,11 +346,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -362,26 +362,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -403,15 +403,15 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput3': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -423,26 +423,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -464,11 +464,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -480,26 +480,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -521,11 +521,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -537,26 +537,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -578,11 +578,11 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -593,38 +593,38 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         },
         'lstmInitialHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmInitialCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -651,15 +651,15 @@ const lstmTests = [
       'expectedOutputs': {
         'lstmOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput3': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -671,26 +671,26 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1, 3, 4, 1, 2],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -715,14 +715,14 @@ const lstmTests = [
             10.469000816345215, 58.02900695800781, 74.52900695800781,
             518.948974609375
           ],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [
             5.510000228881836, 20.01000213623047, 19.110000610351564,
             75.20999908447266
           ],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -733,38 +733,38 @@ const lstmTests = [
       'inputs': {
         'lstmInput': {
           'data': [1, 2, 2, 1, 3, 4, 1, 2],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'float32'}
         },
         'lstmWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmRecurrentWeight': {
           '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': {'dimensions': [1, 8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8, 2], dataType: 'float32'}
         },
         'lstmBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [1, 8], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 8], dataType: 'float32'}
         },
         'lstmPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 6], dataType: 'float32'}
         },
         'lstmInitialHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmInitialCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -794,21 +794,21 @@ const lstmTests = [
             10.469000816345215, 58.02900695800781, 74.52900695800781,
             518.948974609375
           ],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput2': {
           'data': [
             5.510000228881836, 20.01000213623047, 19.110000610351564,
             75.20999908447266
           ],
-          'descriptor': {'dimensions': [1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2], dataType: 'float32'}
         },
         'lstmOutput3': {
           'data': [
             10.469000816345215, 58.02900695800781, 74.52900695800781,
             518.948974609375, 1, 8, 1, 8
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
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 9bc71a6224c..d6b16029b0d 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
@@ -59,34 +59,34 @@ const lstmCellTests = [
       'inputs': {
         'lstmCellInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         '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': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -108,11 +108,11 @@ const lstmCellTests = [
       'expectedOutputs': {
         'lstmCellOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -124,38 +124,38 @@ const lstmCellTests = [
       'inputs': {
         'lstmCellInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         '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': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -178,11 +178,11 @@ const lstmCellTests = [
       'expectedOutputs': {
         'lstmCellOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -194,34 +194,34 @@ const lstmCellTests = [
       'inputs': {
         'lstmCellInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         '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': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -244,11 +244,11 @@ const lstmCellTests = [
       'expectedOutputs': {
         'lstmCellOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -260,34 +260,34 @@ const lstmCellTests = [
       'inputs': {
         'lstmCellInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         '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': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -310,11 +310,11 @@ const lstmCellTests = [
       'expectedOutputs': {
         'lstmCellOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -325,38 +325,38 @@ const lstmCellTests = [
       'inputs': {
         'lstmCellInput': {
           'data': [1, 2, 2, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         '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': {'dimensions': [8, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'}
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellCellState': {
           'data': [0, 0, 0, 0],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'lstmCellPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {'dimensions': [6], 'dataType': 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,11 +380,11 @@ const lstmCellTests = [
       'expectedOutputs': {
         'lstmCellOutput1': {
           'data': [1, 8, 27, 216],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         },
         'lstmCellOutput2': {
           'data': [1, 4, 9, 36],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
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 888e511dfdb..ef0b7f20051 100644
--- a/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js
@@ -15,8 +15,8 @@
 
 const getMatmulPrecisionTolerance = (graphResources) => {
   const args = graphResources.operators[0].arguments;
-  const shapeA = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                     .descriptor.dimensions;
+  const shapeA =
+      graphResources.inputs[args[0][Object.keys(args[0])[0]]].descriptor.shape;
   const tolerance = shapeA[shapeA.length - 1] * 2;
   const toleranceValueDict = {float32: tolerance, float16: tolerance};
   const expectedDataType =
@@ -36,7 +36,7 @@ const matmulTests = [
             79.85144805908203, 99.64449310302734, 24.740541458129883,
             65.9624252319336, 38.136077880859375, 87.11140441894531
           ],
-          'descriptor': {'dimensions': [3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -48,7 +48,7 @@ const matmulTests = [
             69.31697082519531,  31.984439849853516, 12.291812896728516,
             13.304834365844727, 85.26705169677734
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -64,7 +64,7 @@ const matmulTests = [
             5133.4072265625, 8816.5986328125, 18226.65234375, 11841.033203125,
             8869.705078125, 6051.1396484375, 5124.5390625, 12413.8984375
           ],
-          'descriptor': {'dimensions': [3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
         }
       }
     }
@@ -84,7 +84,7 @@ const matmulTests = [
             16.142963409423828, 57.45134735107422,  26.826417922973633,
             85.02970123291016,  36.1988639831543,   89.60960388183594
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -103,7 +103,7 @@ const matmulTests = [
             38.19757843017578,  78.17564392089844,  62.57684326171875,
             88.35256958007812
           ],
-          'descriptor': {'dimensions': [2, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -125,7 +125,7 @@ const matmulTests = [
             11060.98046875,   10352.16015625,   10515.310546875,
             16153.86328125,   17833.36328125,   15971.80859375
           ],
-          'descriptor': {'dimensions': [2, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -145,7 +145,7 @@ const matmulTests = [
             16.142963409423828, 57.45134735107422,  26.826417922973633,
             85.02970123291016,  36.1988639831543,   89.60960388183594
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -164,7 +164,7 @@ const matmulTests = [
             38.19757843017578,  78.17564392089844,  62.57684326171875,
             88.35256958007812
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -186,7 +186,7 @@ const matmulTests = [
             11060.98046875,   10352.16015625,   10515.310546875,
             16153.86328125,   17833.36328125,   15971.80859375
           ],
-          'descriptor': {'dimensions': [2, 1, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -206,14 +206,14 @@ const matmulTests = [
             16.142963409423828, 57.45134735107422,  26.826417922973633,
             85.02970123291016,  36.1988639831543,   89.60960388183594
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             27.829805374145508, 83.1454849243164, 34.41289520263672,
             83.20379638671875
           ],
-          'descriptor': {'dimensions': [1, 4, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -227,7 +227,7 @@ const matmulTests = [
             15019.9462890625, 11942.376953125, 15035.0322265625,
             13553.013671875, 12302.328125, 16517.9765625
           ],
-          'descriptor': {'dimensions': [2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 1], dataType: 'float32'}
         }
       }
     }
@@ -247,14 +247,14 @@ const matmulTests = [
             16.142963409423828, 57.45134735107422,  26.826417922973633,
             85.02970123291016,  36.1988639831543,   89.60960388183594
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             27.829805374145508, 83.1454849243164, 34.41289520263672,
             83.20379638671875
           ],
-          'descriptor': {'dimensions': [4, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -268,7 +268,7 @@ const matmulTests = [
             15019.9462890625, 11942.376953125, 15035.0322265625,
             13553.013671875, 12302.328125, 16517.9765625
           ],
-          'descriptor': {'dimensions': [2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 1], dataType: 'float32'}
         }
       }
     }
@@ -296,7 +296,7 @@ const matmulTests = [
             37.49127960205078,  51.397132873535156, 53.19015121459961,
             38.33119201660156,  75.20586395263672,  3.8537938594818115
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -308,7 +308,7 @@ const matmulTests = [
             69.31697082519531,  31.984439849853516, 12.291812896728516,
             13.304834365844727, 85.26705169677734
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -340,7 +340,7 @@ const matmulTests = [
             12841.802734375,   8145.45654296875,  8134.66650390625,
             4344.25,           7138.79052734375,  8497.98046875
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -368,7 +368,7 @@ const matmulTests = [
             37.49127960205078,  51.397132873535156, 53.19015121459961,
             38.33119201660156,  75.20586395263672,  3.8537938594818115
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -387,7 +387,7 @@ const matmulTests = [
             38.19757843017578,  78.17564392089844,  62.57684326171875,
             88.35256958007812
           ],
-          'descriptor': {'dimensions': [2, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -419,7 +419,7 @@ const matmulTests = [
             16430.63671875,    10880.1533203125,  10752.34765625,
             6632.99462890625,  12342.2919921875,  8384.3896484375
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -448,7 +448,7 @@ const matmulTests = [
             37.49127960205078,  51.397132873535156, 53.19015121459961,
             38.33119201660156,  75.20586395263672,  3.8537938594818115
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -460,7 +460,7 @@ const matmulTests = [
             69.31697082519531,  31.984439849853516, 12.291812896728516,
             13.304834365844727, 85.26705169677734
           ],
-          'descriptor': {'dimensions': [1, 1, 1, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -492,7 +492,7 @@ const matmulTests = [
             12841.802734375,   8145.45654296875,  8134.66650390625,
             4344.25,           7138.79052734375,  8497.98046875
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -521,7 +521,7 @@ const matmulTests = [
             37.49127960205078,  51.397132873535156, 53.19015121459961,
             38.33119201660156,  75.20586395263672,  3.8537938594818115
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -540,7 +540,7 @@ const matmulTests = [
             31.984439849853516, 12.291812896728516, 13.304834365844727,
             85.26705169677734
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -572,7 +572,7 @@ const matmulTests = [
             12841.802734375,   8145.45654296875,  8134.66650390625,
             4344.25,           7138.79052734375,  8497.98046875
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float32'}
         }
       }
     }
@@ -600,7 +600,7 @@ const matmulTests = [
             37.49127960205078,  51.397132873535156, 53.19015121459961,
             38.33119201660156,  75.20586395263672,  3.8537938594818115
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -612,7 +612,7 @@ const matmulTests = [
             69.31697082519531,  31.984439849853516, 12.291812896728516,
             13.304834365844727, 85.26705169677734
           ],
-          'descriptor': {'dimensions': [4, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -644,7 +644,7 @@ const matmulTests = [
             12841.802734375,   8145.45654296875,  8134.66650390625,
             4344.25,           7138.79052734375,  8497.98046875
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 3, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
index 0c28b85994d..08befe3da0c 100644
--- a/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
@@ -36,7 +36,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const maxTests = [
             -59.90718078613281,  97.15335083007812,   -40.226924896240234,
             -61.5142707824707,   33.363243103027344,  12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const maxTests = [
             79.85667419433594,   97.15335083007812,   1.2300019264221191,
             65.67964935302734,   99.89971160888672,   12.693191528320312
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const maxTests = [
       'inputs': {
         'inputA': {
           'data': [48.26115417480469],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const maxTests = [
             79.85667419433594,  48.26115417480469, 48.26115417480469,
             65.67964935302734,  99.89971160888672, 48.26115417480469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             49.523128509521484, -61.555763244628906, -6.564808368682861,
             93.32227325439453, 3.3104186058044434, -98.31839752197266
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -427,7 +427,7 @@ const maxTests = [
             79.85667419433594,  -22.918458938598633, 1.2300019264221191,
             93.32227325439453,  99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -447,14 +447,14 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             39.32178497314453, 44.523738861083984, 58.046287536621094,
             84.13702392578125
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const maxTests = [
             79.85667419433594,  58.046287536621094, 58.046287536621094,
             84.13702392578125,  99.89971160888672,  84.13702392578125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -485,7 +485,7 @@ const maxTests = [
       'inputs': {
         'inputA': {
           'data': [48.26115417480469],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -498,7 +498,7 @@ const maxTests = [
             79.85667419433594,   -22.918458938598633, 1.2300019264221191,
             65.67964935302734,   99.89971160888672,   -62.321685791015625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -518,7 +518,7 @@ const maxTests = [
             79.85667419433594,  48.26115417480469, 48.26115417480469,
             65.67964935302734,  99.89971160888672, 48.26115417480469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/min.https.any.js b/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
index 2892bc1ec0f..1dda0bb44a7 100644
--- a/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
@@ -36,7 +36,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const minTests = [
             -69.85066223144531, 40.676490783691406, -18.700122833251953,
             20.14988136291504,  41.95068359375,     23.482912063598633
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const minTests = [
       'inputs': {
         'inputA': {
           'data': [34.42634582519531],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -19.072668075561523, -78.27516174316406, -13.436244010925293,
             -93.01346588134766, -72.27899169921875, 63.14110565185547
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -427,7 +427,7 @@ const minTests = [
             -80.47379302978516,  -78.27516174316406, -73.2723617553711,
             -93.01346588134766,  -72.27899169921875, 4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -447,14 +447,14 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             23.231731414794922, 84.62673950195312, -83.33529663085938,
             -22.82455825805664
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const minTests = [
             -83.33529663085938,  -83.33529663085938,  -83.33529663085938,
             -33.74562072753906,  -22.82455825805664,  -22.82455825805664
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -485,7 +485,7 @@ const minTests = [
       'inputs': {
         'inputA': {
           'data': [34.42634582519531],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -498,7 +498,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -518,7 +518,7 @@ const minTests = [
             -80.47379302978516,  -31.389848709106445, -73.2723617553711,
             -33.74562072753906,  -21.70152473449707,  4.945605278015137
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js b/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
index d46a4d90744..27a5dbd3249 100644
--- a/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
@@ -36,7 +36,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const mulTests = [
             -26.158620834350586, -18.935443878173828, 34.6467170715332,
             -60.95826721191406,  -11.119653701782227, 77.50324249267578
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const mulTests = [
             2197.89208984375,   1781.2109375,        2037.47900390625,
             3844.01513671875,   -36.79807662963867,  766.0423583984375
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const mulTests = [
       'inputs': {
         'inputA': {
           'data': [67.50372314453125],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const mulTests = [
             -5671.7783203125,   -6349.91064453125,   3969.7099609375,
             -4256.77001953125,  223.388916015625,    667.20703125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -97.29339599609375, -81.70872497558594, -63.859336853027344,
             -25.192203521728516, 94.61557006835938, -20.381790161132812
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -431,7 +431,7 @@ const mulTests = [
             -3755.3935546875,    1588.6148681640625,
             313.10968017578125,  -201.4536895751953
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -451,14 +451,14 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             8.696772575378418, 48.377689361572266, 97.7515869140625,
             62.21574783325195
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -478,7 +478,7 @@ const mulTests = [
             -8213.255859375,     -9195.2529296875,   5748.50439453125,
             -3923.3115234375,    205.88949584960938, 614.940673828125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -489,7 +489,7 @@ const mulTests = [
       'inputs': {
         'inputA': {
           'data': [67.50372314453125],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -502,7 +502,7 @@ const mulTests = [
             -84.02171325683594,  -94.06755828857422,   58.807273864746094,
             -63.059783935546875, 3.3092827796936035,   9.884003639221191
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -522,7 +522,7 @@ const mulTests = [
             -5671.7783203125,   -6349.91064453125,   3969.7099609375,
             -4256.77001953125,  223.388916015625,    667.20703125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js b/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
index 8ffe3623567..a77109a9ef1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
@@ -28,7 +28,7 @@ const negTests = [
       'inputs': {
         'negInput': {
           'data': [94.23045349121094],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const negTests = [
       'expectedOutputs': {
         'negOutput': {
           'data': [-94.23045349121094],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -50,7 +50,7 @@ const negTests = [
       'inputs': {
         'negInput': {
           'data': [-58.334503173828125],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -61,7 +61,7 @@ const negTests = [
       'expectedOutputs': {
         'negOutput': {
           'data': [58.334503173828125],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -81,7 +81,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -102,7 +102,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -122,7 +122,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -142,7 +142,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -162,7 +162,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -182,7 +182,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -202,7 +202,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -222,7 +222,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -242,7 +242,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -262,7 +262,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -282,7 +282,7 @@ const negTests = [
             -66.4577865600586,   -11.172324180603027, -25.024961471557617,
             22.26478385925293,   35.29130172729492,   -86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -302,7 +302,7 @@ const negTests = [
             66.4577865600586,   11.172324180603027,  25.024961471557617,
             -22.26478385925293, -35.29130172729492,  86.18817138671875
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/pad.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pad.https.any.js
index c05f18f83c2..203d0b7299c 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pad.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pad.https.any.js
@@ -47,7 +47,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [9], 'dataType': 'float32'},
+          'descriptor': {shape: [9], dataType: 'float32'},
           'constant': true
         }
       },
@@ -66,7 +66,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547, 0
           ],
-          'descriptor': {'dimensions': [11], 'dataType': 'float32'}
+          'descriptor': {shape: [11], dataType: 'float32'}
         }
       }
     }
@@ -81,7 +81,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [9], 'dataType': 'float32'}
+          'descriptor': {shape: [9], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -99,7 +99,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547, 0
           ],
-          'descriptor': {'dimensions': [11], 'dataType': 'float32'}
+          'descriptor': {shape: [11], dataType: 'float32'}
         }
       }
     }
@@ -114,7 +114,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -154,7 +154,7 @@ const padTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [5, 5], dataType: 'float32'}
         }
       }
     }
@@ -169,7 +169,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -259,7 +259,7 @@ const padTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [3, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 5, 5], dataType: 'float32'}
         }
       }
     }
@@ -274,7 +274,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -364,7 +364,7 @@ const padTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 3], dataType: 'float32'}
         }
       }
     }
@@ -379,7 +379,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -469,7 +469,7 @@ const padTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -484,7 +484,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -524,7 +524,7 @@ const padTests = [
             0,
             0
           ],
-          'descriptor': {'dimensions': [5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [5, 5], dataType: 'float32'}
         }
       }
     }
@@ -539,7 +539,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -579,7 +579,7 @@ const padTests = [
             1,
             1
           ],
-          'descriptor': {'dimensions': [5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [5, 5], dataType: 'float32'}
         }
       }
     }
@@ -594,7 +594,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -626,7 +626,7 @@ const padTests = [
             -47.8821907043457,   68.72557830810547,   68.72557830810547,
             68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 1], dataType: 'float32'}
         }
       }
     }
@@ -641,7 +641,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -673,7 +673,7 @@ const padTests = [
             -21.168529510498047, -91.66168975830078,  -21.168529510498047,
             22.76361846923828
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 1], dataType: 'float32'}
         }
       }
     }
@@ -688,7 +688,7 @@ const padTests = [
             16.863798141479492, 60.51472091674805, -70.56755065917969,
             -60.643272399902344, -47.8821907043457, 68.72557830810547
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -720,7 +720,7 @@ const padTests = [
             60.51472091674805,   -70.56755065917969,  -70.56755065917969,
             60.51472091674805
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/parallel-compute.https.any.js b/tests/wpt/tests/webnn/conformance_tests/parallel-compute.https.any.js
index 3b9c41276ad..a1c20f1ff30 100644
--- a/tests/wpt/tests/webnn/conformance_tests/parallel-compute.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/parallel-compute.https.any.js
@@ -26,7 +26,7 @@ const testParallelCompute = () => {
     }
     // Construct a simple graph: A = B * 2.
     const builder = new MLGraphBuilder(mlContext);
-    const operandType = {dataType: 'float32', dimensions: [1]};
+    const operandType = {dataType: 'float32', shape: [1]};
     const inputOperand = builder.input('input', operandType);
     const constOperand = builder.constant(operandType, Float32Array.from([2]));
     const outputOperand = builder.mul(inputOperand, constOperand);
diff --git a/tests/wpt/tests/webnn/conformance_tests/parallel-dispatch.https.any.js b/tests/wpt/tests/webnn/conformance_tests/parallel-dispatch.https.any.js
index 5594d845d9b..dfdf70a6aa4 100644
--- a/tests/wpt/tests/webnn/conformance_tests/parallel-dispatch.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/parallel-dispatch.https.any.js
@@ -32,7 +32,7 @@ function buildMulGraph(context, operandDescriptor, multiplier) {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
 
@@ -72,7 +72,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
   const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 3);
@@ -100,7 +100,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
   const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 10);
@@ -139,7 +139,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
   const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 9);
@@ -177,7 +177,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
   const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 2);
@@ -210,7 +210,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
 
@@ -249,7 +249,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
 
@@ -287,7 +287,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
 
@@ -323,7 +323,7 @@ promise_test(async () => {
 promise_test(async () => {
   const operandDescriptor = {
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
   };
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
index 9dfd6ba0ca4..52c6c80c7b5 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
@@ -37,8 +37,8 @@
 
 const getPoolingOperatorsPrecisionTolerance = (graphResources) => {
   const args = graphResources.operators[0].arguments;
-  const inputShape = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                         .descriptor.dimensions;
+  const inputShape =
+      graphResources.inputs[args[0][Object.keys(args[0])[0]]].descriptor.shape;
   const options =
       args.length === 2 ? {...args[1][Object.keys(args[1])[0]]} : {};
   let height;
@@ -101,7 +101,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -113,7 +113,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -142,7 +142,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -153,7 +153,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -182,7 +182,7 @@ const poolingOperatorsTests = [
             -26.032955169677734, -22.73752784729004,  -70.32036590576172,
             -85.28227996826172,  -92.10668182373047
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -193,7 +193,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [-49.258975982666016, -60.52408981323242],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -222,7 +222,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -243,7 +243,7 @@ const poolingOperatorsTests = [
             43.23125457763672, 37.842769622802734, 32.67961120605469,
             41.17021942138672, 42.79708480834961, 38.987247467041016
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -273,7 +273,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -287,7 +287,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -316,7 +316,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -334,7 +334,7 @@ const poolingOperatorsTests = [
             46.15715408325195, 46.63268280029297, 43.616947174072266,
             44.72445297241211, 44.05451583862305
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -363,7 +363,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -381,7 +381,7 @@ const poolingOperatorsTests = [
             54.00202560424805, 49.65404510498047, 35.84912109375,
             41.17021942138672, 38.987247467041016
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -410,7 +410,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -424,7 +424,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [32.2001838684082, 42.971012115478516],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -453,7 +453,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -465,7 +465,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -494,7 +494,7 @@ const poolingOperatorsTests = [
             68.72449493408203,  1.4140757322311401, 76.45657348632812,
             78.10037994384766,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -506,7 +506,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -536,7 +536,7 @@ const poolingOperatorsTests = [
             68.72449493408203,  1.4140757322311401, 76.45657348632812,
             78.10037994384766,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -550,7 +550,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'averagePool2dOutput': {
           'data': [47.26926803588867, 44.72445297241211],
-          'descriptor': {'dimensions': [1, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -579,7 +579,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -603,7 +603,7 @@ const poolingOperatorsTests = [
             58.46046447753906, 52.73374557495117, 39.1442985534668,
             43.23125457763672, 32.67961120605469
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -632,7 +632,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -659,7 +659,7 @@ const poolingOperatorsTests = [
             43.23125457763672, 32.67961120605469, 56.23945999145508,
             40.00800323486328, 43.85149002075195, 41.061283111572266
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -689,7 +689,7 @@ const poolingOperatorsTests = [
             68.72449493408203,  1.4140757322311401, 76.45657348632812,
             78.10037994384766,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -714,7 +714,7 @@ const poolingOperatorsTests = [
             39.1442985534668, 50.038944244384766, 43.23125457763672,
             58.46046447753906, 32.67961120605469
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -744,7 +744,7 @@ const poolingOperatorsTests = [
             68.72449493408203,  1.4140757322311401, 76.45657348632812,
             78.10037994384766,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -772,7 +772,7 @@ const poolingOperatorsTests = [
             37.24428939819336, 40.00800323486328, 54.04661178588867,
             43.85149002075195, 78.58363342285156, 41.061283111572266
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -802,7 +802,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -830,7 +830,7 @@ const poolingOperatorsTests = [
             43.23125457763672, 32.67961120605469, 56.23945999145508,
             40.00800323486328, 43.85149002075195, 41.061283111572266
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -860,7 +860,7 @@ const poolingOperatorsTests = [
             2.2384984493255615, 14.50549030303955,  68.72449493408203,
             76.45657348632812,  23.53263282775879
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -885,7 +885,7 @@ const poolingOperatorsTests = [
             58.46046447753906, 52.73374557495117, 39.1442985534668,
             43.23125457763672, 32.67961120605469
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -931,7 +931,7 @@ const poolingOperatorsTests = [
             56.961090087890625, 34.77016067504883,  0.9611223936080933,
             35.30686950683594,  98.00790405273438
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -958,7 +958,7 @@ const poolingOperatorsTests = [
             50.19099807739258, 29.15436363220215, 52.98439025878906,
             43.10562515258789, 66.77796936035156, 55.2725830078125
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -989,7 +989,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1001,7 +1001,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [289.01953125, 292.6146545410156],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1030,7 +1030,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1041,7 +1041,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [289.01953125, 292.6146545410156],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1070,7 +1070,7 @@ const poolingOperatorsTests = [
             -89.39192199707031,  -61.13504409790039,  -84.16869354248047,
             -77.36112213134766,  -91.17266082763672
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1081,7 +1081,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [298.928955078125, 326.83587646484375],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1110,7 +1110,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1130,7 +1130,7 @@ const poolingOperatorsTests = [
             165.07762145996094, 165.45819091796875, 161.11062622070312,
             176.6307373046875, 174.245361328125, 180.60714721679688
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -1159,7 +1159,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1176,7 +1176,7 @@ const poolingOperatorsTests = [
             269.777587890625, 241.52200317382812, 212.99337768554688,
             292.6146545410156, 253.77178955078125
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1205,7 +1205,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1223,7 +1223,7 @@ const poolingOperatorsTests = [
             168.4636688232422, 170.331787109375, 174.72145080566406,
             176.6307373046875, 180.60714721679688
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1252,7 +1252,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1266,7 +1266,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [189.47933959960938, 207.25343322753906],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1295,7 +1295,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1307,7 +1307,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [289.01953125, 292.6146545410156],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1336,7 +1336,7 @@ const poolingOperatorsTests = [
             67.77167510986328,   83.68133544921875,  69.69512176513672,
             21.79571533203125,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1348,7 +1348,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [289.01953125, 292.6146545410156],
-          'descriptor': {'dimensions': [1, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -1377,7 +1377,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1401,7 +1401,7 @@ const poolingOperatorsTests = [
             149.63897705078125, 142.6990966796875, 139.51637268066406,
             165.07762145996094, 161.11062622070312
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1430,7 +1430,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1457,7 +1457,7 @@ const poolingOperatorsTests = [
             165.07762145996094, 161.11062622070312, 96.38701629638672,
             150.1616668701172, 146.8201904296875, 8216.69921875
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -1487,7 +1487,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1515,7 +1515,7 @@ const poolingOperatorsTests = [
             165.07762145996094, 161.11062622070312, 96.38701629638672,
             150.1616668701172, 146.8201904296875, 8216.69921875
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -1545,7 +1545,7 @@ const poolingOperatorsTests = [
             90.86540985107422,   39.56248474121094,   67.77167510986328,
             69.69512176513672,   89.54518127441406
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1570,7 +1570,7 @@ const poolingOperatorsTests = [
             149.63897705078125, 142.6990966796875, 139.51637268066406,
             165.07762145996094, 161.11062622070312
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1615,7 +1615,7 @@ const poolingOperatorsTests = [
             60.689762115478516, 20.046878814697266, 13.203198432922363,
             33.33952713012695,  0.5279953479766846
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1643,7 +1643,7 @@ const poolingOperatorsTests = [
             158.64576721191406, 166.2051544189453, 171.07916259765625,
             148.70985412597656, 218.7123260498047, 153.33311462402344
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -1674,7 +1674,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'},
           'constant': true
         }
       },
@@ -1686,7 +1686,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'maxPool2dOutput': {
           'data': [99.28312683105469, 81.73119354248047],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1715,7 +1715,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1726,7 +1726,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'maxPool2dOutput': {
           'data': [99.28312683105469, 81.73119354248047],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1755,7 +1755,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1775,7 +1775,7 @@ const poolingOperatorsTests = [
             81.73119354248047, 72.8883056640625, 72.44898986816406,
             80.30484008789062, 72.8883056640625, 72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -1804,7 +1804,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1821,7 +1821,7 @@ const poolingOperatorsTests = [
             99.28312683105469, 81.73119354248047, 72.8883056640625,
             81.73119354248047, 72.8883056640625
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1850,7 +1850,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1868,7 +1868,7 @@ const poolingOperatorsTests = [
             72.1085205078125, 81.73119354248047, 72.44898986816406,
             80.30484008789062, 72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -1897,7 +1897,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1911,7 +1911,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'maxPool2dOutput': {
           'data': [89.00830078125, 72.33577728271484],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1940,7 +1940,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1952,7 +1952,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'maxPool2dOutput': {
           'data': [99.28312683105469, 81.73119354248047],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -1981,7 +1981,7 @@ const poolingOperatorsTests = [
             15.935754776000977,  39.383602142333984,  -78.77953338623047,
             7.429088115692139,   72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 5, 5, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1993,7 +1993,7 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'maxPool2dOutput': {
           'data': [99.28312683105469, 81.73119354248047],
-          'descriptor': {'dimensions': [1, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -2022,7 +2022,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2046,7 +2046,7 @@ const poolingOperatorsTests = [
             72.1085205078125, 81.73119354248047, 72.44898986816406,
             81.73119354248047, 72.44898986816406
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -2075,7 +2075,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2102,7 +2102,7 @@ const poolingOperatorsTests = [
             81.73119354248047, 72.44898986816406, 55.890525817871094,
             80.30484008789062, 72.33577728271484, 72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -2132,7 +2132,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2160,7 +2160,7 @@ const poolingOperatorsTests = [
             81.73119354248047, 72.44898986816406, 55.890525817871094,
             80.30484008789062, 72.33577728271484, 72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
       }
     }
@@ -2190,7 +2190,7 @@ const poolingOperatorsTests = [
             -57.294559478759766, -26.623577117919922, 15.935754776000977,
             -78.77953338623047,  72.33577728271484
           ],
-          'descriptor': {'dimensions': [1, 2, 5, 5], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2215,7 +2215,7 @@ const poolingOperatorsTests = [
             72.1085205078125, 81.73119354248047, 72.44898986816406,
             81.73119354248047, 72.44898986816406
           ],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -2261,7 +2261,7 @@ const poolingOperatorsTests = [
             58.0643424987793,    -51.168277740478516, -17.768583297729492,
             9.961172103881836,   -52.73843002319336
           ],
-          'descriptor': {'dimensions': [1, 7, 7, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 7, 7, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -2289,7 +2289,7 @@ const poolingOperatorsTests = [
             95.25411224365234, 94.72747802734375, 95.25411224365234,
             98.13465881347656, 63.419517517089844, 98.13465881347656
           ],
-          'descriptor': {'dimensions': [1, 3, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 3, 2], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
index 3da766df69d..fa18368d94e 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
@@ -37,7 +37,7 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -45,7 +45,7 @@ const powTests = [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -82,7 +82,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -102,14 +102,14 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -145,7 +145,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -165,14 +165,14 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -208,7 +208,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -228,14 +228,14 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -271,7 +271,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -291,14 +291,14 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -334,7 +334,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -354,14 +354,14 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             1,  6,  -7, 7,  -2, 1, 4,  -10, -2, -5, -2, -10,
             -8, -7, -1, -3, -9, 6, -6, 7,   -5, -5, 7,  -6
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -397,7 +397,7 @@ const powTests = [
             485079424,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -418,13 +418,10 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
-        'inputB': {
-          'data': [2],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'inputB': {'data': [2], 'descriptor': {shape: [], dataType: 'float32'}}
       },
       'operators': [{
         'name': 'pow',
@@ -443,7 +440,7 @@ const powTests = [
             296.84356689453125, 8.328523635864258,   2.073643445968628,
             33.14323043823242,  303.1522521972656,   303.2897033691406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -464,13 +461,11 @@ const powTests = [
             5.891367435455322,  0.12803149223327637, 19.654495239257812,
             3.4122724533081055, 4.945034980773926,   4.437101364135742
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
-        'inputB': {
-          'data': [0.5],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'inputB':
+            {'data': [0.5], 'descriptor': {shape: [], dataType: 'float32'}}
       },
       'operators': [{
         'name': 'pow',
@@ -489,7 +484,7 @@ const powTests = [
             2.4272139072418213, 0.35781487822532654, 4.4333391189575195,
             1.847233772277832,  2.223743438720703,   2.106442928314209
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -510,11 +505,11 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [5, -10, -10, 7, -7, -9],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -534,7 +529,7 @@ const powTests = [
             1518165.5,      0.00002495513399480842, 0.026081321761012077,
             -209595.46875,  2.0615180673644318e-9,  6.786416914539295e-12
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -555,11 +550,11 @@ const powTests = [
             17.229148864746094,  -2.885918140411377,  -1.4400150775909424,
             -5.757015705108643,  17.41126823425293,   17.41521453857422
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [-5, -10, 9, -6],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -595,7 +590,7 @@ const powTests = [
             3.5893645389251105e-8,
             3.584487018315485e-8
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
index 4730d4e2d17..02f545ad596 100644
--- a/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
@@ -15,14 +15,6 @@
 //
 // MLOperand prelu(MLOperand input, MLOperand slope);
 
-
-const getPreluPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 1, float16: 1};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const preluTests = [
   {
     'name': 'prelu float32 0D scalar',
@@ -30,12 +22,12 @@ const preluTests = [
       'inputs': {
         'preluInput': {
           'data': [-4.794857501983643],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
           'data': [1.1202747821807861],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -47,7 +39,7 @@ const preluTests = [
       'expectedOutputs': {
         'preluOutput': {
           'data': [-5.371557712554932],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -67,7 +59,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -81,7 +73,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -102,7 +94,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -122,7 +114,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -136,7 +128,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -157,7 +149,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -177,7 +169,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 6], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -191,7 +183,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 6], dataType: 'float32'},
           'constant': true
         }
       },
@@ -212,7 +204,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -232,7 +224,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -246,7 +238,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -267,7 +259,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -287,7 +279,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -301,7 +293,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -322,7 +314,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -342,7 +334,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -356,7 +348,7 @@ const preluTests = [
             3.58212947845459,   -2.3224003314971924, -1.9816573858261108,
             4.155889987945557,  -1.799522042274475,  9.295849800109863
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -377,7 +369,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   18.365745544433594,
             -1.0895805358886719, 1.3258955478668213,  -68.95950317382812
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -397,12 +389,12 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
           'data': [5.073923110961914, 0.480774462223053, -7.091750144958496],
-          'descriptor': {'dimensions': [3], 'dataType': 'float32'},
+          'descriptor': {shape: [3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -423,7 +415,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,    65.72542572021484,
             -1.330268144607544,  1.3258955478668213,   52.60881042480469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -443,12 +435,12 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
           'data': [5.0114545822143555],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'},
+          'descriptor': {shape: [1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -469,7 +461,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   -46.44551467895508,
             -1.3138903379440308, 1.3258955478668213,  -37.17652893066406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -489,7 +481,7 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
@@ -497,7 +489,7 @@ const preluTests = [
             4.874276161193848, -8.501633644104004, 1.1819270849227905,
             -9.985190391540527, -4.424202919006348, -6.654683589935303
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -518,7 +510,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,  -10.953948020935059,
             2.617891550064087,   1.3258955478668213, 49.366512298583984
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -538,12 +530,12 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
           'data': [5.073923110961914, 0.480774462223053, -7.091750144958496],
-          'descriptor': {'dimensions': [1, 1, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 3], dataType: 'float32'},
           'constant': true
         }
       },
@@ -564,7 +556,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,    65.72542572021484,
             -1.330268144607544,  1.3258955478668213,   52.60881042480469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -584,12 +576,12 @@ const preluTests = [
             8.47507381439209,   4.551425457000732,   -9.267870903015137,
             -0.262177437543869, 1.3258955478668213,  -7.41831111907959
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'},
           'constant': true
         },
         'preluSlope': {
           'data': [5.0114545822143555],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'},
           'constant': true
         }
       },
@@ -610,7 +602,7 @@ const preluTests = [
             8.47507381439209,    4.551425457000732,   -46.44551467895508,
             -1.3138903379440308, 1.3258955478668213,  -37.17652893066406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -619,8 +611,7 @@ const preluTests = [
 
 if (navigator.ml) {
   preluTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getPreluPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js b/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
index acae378d80b..0871c881b71 100644
--- a/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
@@ -32,17 +32,17 @@ const quantizeLinearTests = [
       'inputs': {
         'quantizeLinearInput': {
           'data': [10.794857501983643],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearScale': {
           'data': [1.1202747821807861],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearZeroPoint': {
           'data': [1],
-          'descriptor': {'dimensions': [], 'dataType': 'int8'},
+          'descriptor': {shape: [], dataType: 'int8'},
           'constant': true
         }
       },
@@ -56,7 +56,7 @@ const quantizeLinearTests = [
       }],
       'expectedOutputs': {
         'quantizeLinearOutput':
-            {'data': [11], 'descriptor': {'dimensions': [], 'dataType': 'int8'}}
+            {'data': [11], 'descriptor': {shape: [], dataType: 'int8'}}
       }
     }
   },
@@ -69,7 +69,7 @@ const quantizeLinearTests = [
             -2.549168109893799, -4.794857501983643, 8.413617134094238,
             6.108623504638672
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'},
+          'descriptor': {shape: [4], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearScale': {
@@ -79,12 +79,12 @@ const quantizeLinearTests = [
             -4.617084980010986,
             1.1202747821807861,
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'},
+          'descriptor': {shape: [4], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearZeroPoint': {
           'data': [128],
-          'descriptor': {'dimensions': [], 'dataType': 'uint8'},
+          'descriptor': {shape: [], dataType: 'uint8'},
           'constant': true
         }
       },
@@ -99,7 +99,7 @@ const quantizeLinearTests = [
       'expectedOutputs': {
         'quantizeLinearOutput': {
           'data': [128, 111, 126, 133],
-          'descriptor': {'dimensions': [4], 'dataType': 'uint8'}
+          'descriptor': {shape: [4], dataType: 'uint8'}
         }
       }
     }
@@ -114,17 +114,17 @@ const quantizeLinearTests = [
             -2.549168109893799, -4.794857501983643, 8.413617134094238,
             6.108623504638672
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearScale': {
           'data': [0.2800687253475189, -4.617084980010986],
-          'descriptor': {'dimensions': [2, 1], 'dataType': 'float32'},
+          'descriptor': {shape: [2, 1], dataType: 'float32'},
           'constant': true
         },
         'quantizeLinearZeroPoint': {
           'data': [128],
-          'descriptor': {'dimensions': [], 'dataType': 'uint8'},
+          'descriptor': {shape: [], dataType: 'uint8'},
           'constant': true
         }
       },
@@ -139,7 +139,7 @@ const quantizeLinearTests = [
       'expectedOutputs': {
         'quantizeLinearOutput': {
           'data': [119, 111, 126, 127],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'uint8'}
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'uint8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reciprocal.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reciprocal.https.any.js
index a97c00e2b99..bbf49a1e0ac 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reciprocal.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reciprocal.https.any.js
@@ -28,7 +28,7 @@ const reciprocalTests = [
       'inputs': {
         'reciprocalInput': {
           'data': [-9.36349105834961],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const reciprocalTests = [
       'expectedOutputs': {
         'reciprocalOutput': {
           'data': [-0.10679777711629868],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const reciprocalTests = [
             8.246277809143066,   -0.2039169818162918, -9.039937019348145,
             9.942809104919434,   -9.540112495422363,  -0.08022662252187729
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const reciprocalTests = [
             0.12126683443784714, -4.903956413269043,   -0.11062023788690567,
             0.10057520121335983, -0.10482056438922882, -12.464690208435059
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
index f15de087cf0..8fa1b4c09c2 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
@@ -33,7 +33,7 @@ const reduceL1Tests = [
       'inputs': {
         'reduceL1Input': {
           'data': [5.50882625579834],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -45,7 +45,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 5.50882625579834,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +56,7 @@ const reduceL1Tests = [
       'inputs': {
         'reduceL1Input': {
           'data': [5.50882625579834],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -68,7 +68,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 5.50882625579834,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -88,7 +88,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -100,7 +100,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -120,7 +120,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -131,7 +131,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -151,7 +151,7 @@ const reduceL1Tests = [
             -20.6556339263916,   -92.2993392944336,   -46.28858184814453,
             -80.57186126708984,  -25.49472999572754,  -48.96730041503906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -162,7 +162,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1215.228515625,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -176,7 +176,7 @@ const reduceL1Tests = [
             18, 29, 35, 36, 4,  76, 41, 18, 53, 29, 25, 94,
             26, 1,  3,  68, 39, 25, 87, 30, 39, 75, 76, 66
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -185,10 +185,8 @@ const reduceL1Tests = [
         'outputs': 'reduceL1Output'
       }],
       'expectedOutputs': {
-        'reduceL1Output': {
-          'data': 993,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceL1Output':
+            {'data': 993, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -201,7 +199,7 @@ const reduceL1Tests = [
             -92, -52, -88, -78, -20, -73, -42, -57, -39, -75, -17, -36,
             -81, -24, -88, -91, -76, -5,  -44, -66, -96, -8,  -69, -27
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -210,10 +208,8 @@ const reduceL1Tests = [
         'outputs': 'reduceL1Output'
       }],
       'expectedOutputs': {
-        'reduceL1Output': {
-          'data': 1344,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceL1Output':
+            {'data': 1344, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -232,7 +228,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -243,7 +239,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -263,7 +259,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -274,7 +270,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -294,7 +290,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -305,7 +301,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -325,7 +321,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +332,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -356,7 +352,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -370,7 +366,7 @@ const reduceL1Tests = [
             142.01541137695312, 106.62430572509766, 175.39280700683594,
             286.7269592285156, 169.36322021484375, 212.59750366210938
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -390,7 +386,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -405,7 +401,7 @@ const reduceL1Tests = [
             258.57110595703125, 174.42807006835938, 102.19830322265625,
             134.52191162109375, 207.92910766601562, 215.07168579101562
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -425,7 +421,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -438,7 +434,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -458,7 +454,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -470,7 +466,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': [1092.72021484375],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -490,7 +486,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -503,7 +499,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': 1092.72021484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -523,7 +519,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -535,7 +531,7 @@ const reduceL1Tests = [
       'expectedOutputs': {
         'reduceL1Output': {
           'data': [1092.72021484375],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -556,7 +552,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -573,7 +569,7 @@ const reduceL1Tests = [
             108.43173217773438, 315.6007995605469, 359.5506591796875,
             309.13702392578125
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -594,7 +590,7 @@ const reduceL1Tests = [
             61.70843505859375,  69.76119232177734,  38.919403076171875,
             52.288333892822266, 22.31783676147461,  99.0719223022461
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -611,7 +607,7 @@ const reduceL1Tests = [
             108.43173217773438, 315.6007995605469, 359.5506591796875,
             309.13702392578125
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
index 7c1d4543462..7fc2ee8e621 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
@@ -34,7 +34,7 @@ const reduceL2Tests = [
       'inputs': {
         'reduceL2Input': {
           'data': [4.860228061676025],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -46,7 +46,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 4.860228061676025,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -57,7 +57,7 @@ const reduceL2Tests = [
       'inputs': {
         'reduceL2Input': {
           'data': [4.860228061676025],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -69,7 +69,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 4.860228061676025,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -89,7 +89,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -101,7 +101,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -121,7 +121,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -132,7 +132,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -152,7 +152,7 @@ const reduceL2Tests = [
             -85.05448913574219,  -30.235260009765625, -47.33808135986328,
             -25.268428802490234, -78.11959075927734,  -28.330944061279297
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -163,7 +163,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 292.57574462890625,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -177,7 +177,7 @@ const reduceL2Tests = [
             4, 29, 8,  56, 42, 78, 89, 64, 56, 81, 85, 18,
             6, 39, 35, 63, 87, 50, 81, 89, 5,  8,  37, 37
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -188,7 +188,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 274.4029846191406,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -202,7 +202,7 @@ const reduceL2Tests = [
             -70, -78, -65, -77, -25, -47, -63, -67, -66, -15, -28, -75,
             -88, -54, -13, -27, -5,  -18, -68, -71, -50, -56, -99, -99
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -213,7 +213,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 300.3830871582031,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -233,7 +233,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -244,7 +244,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -264,7 +264,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -275,7 +275,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -295,7 +295,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -306,7 +306,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -326,7 +326,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -337,7 +337,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -357,7 +357,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -371,7 +371,7 @@ const reduceL2Tests = [
             122.352783203125, 124.8213119506836, 128.20062255859375,
             128.14801025390625, 87.18083953857422, 55.043975830078125
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -391,7 +391,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -406,7 +406,7 @@ const reduceL2Tests = [
             114.44775390625, 110.26422882080078, 133.47344970703125,
             64.96752166748047, 128.0914764404297, 101.677734375
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -426,7 +426,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -439,7 +439,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -459,7 +459,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -471,7 +471,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': [272.0996398925781],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -491,7 +491,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -504,7 +504,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': 272.0996398925781,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -524,7 +524,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -536,7 +536,7 @@ const reduceL2Tests = [
       'expectedOutputs': {
         'reduceL2Output': {
           'data': [272.0996398925781],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -557,7 +557,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -573,7 +573,7 @@ const reduceL2Tests = [
           'data': [
             138.580078125, 166.67791748046875, 149.91552734375, 67.6578598022461
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -594,7 +594,7 @@ const reduceL2Tests = [
             11.320085525512695, 64.75763702392578,  43.6589469909668,
             0.8374307155609131, 0.6848266124725342, 33.504703521728516
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -610,7 +610,7 @@ const reduceL2Tests = [
           'data': [
             138.580078125, 166.67791748046875, 149.91552734375, 67.6578598022461
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
index 47a88732ded..5ed23e1af47 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
@@ -34,7 +34,7 @@ const reduceLogSumTests = [
       'inputs': {
         'reduceLogSumInput': {
           'data': [64.54827117919922],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -46,7 +46,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 4.167413234710693,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -57,7 +57,7 @@ const reduceLogSumTests = [
       'inputs': {
         'reduceLogSumInput': {
           'data': [64.54827117919922],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -70,7 +70,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 4.167413234710693,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -103,7 +103,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -134,7 +134,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -149,7 +149,7 @@ const reduceLogSumTests = [
             63, 82, 49, 23, 98, 67, 15, 9,  89, 7, 69, 61,
             47, 50, 41, 39, 58, 52, 35, 83, 81, 7, 34, 9
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.063048362731934,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -191,7 +191,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -211,7 +211,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -222,7 +222,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -242,7 +242,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -253,7 +253,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -273,7 +273,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -284,7 +284,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -304,7 +304,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -319,7 +319,7 @@ const reduceLogSumTests = [
             5.593751907348633, 4.773046016693115, 5.3115739822387695,
             5.2497639656066895, 4.973392486572266, 5.373587131500244
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -339,7 +339,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -354,7 +354,7 @@ const reduceLogSumTests = [
             5.410027980804443, 5.367736339569092, 5.399682998657227,
             4.652334213256836, 4.744638442993164, 5.565346717834473
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -374,7 +374,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -387,7 +387,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -407,7 +407,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -420,7 +420,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': [7.039101600646973],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -440,7 +440,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -453,7 +453,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': 7.039101600646973,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -473,7 +473,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -486,7 +486,7 @@ const reduceLogSumTests = [
       'expectedOutputs': {
         'reduceLogSumOutput': {
           'data': [7.039101600646973],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -507,7 +507,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -524,7 +524,7 @@ const reduceLogSumTests = [
             5.7273993492126465, 5.64375114440918, 5.453810214996338,
             5.758983135223389
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -545,7 +545,7 @@ const reduceLogSumTests = [
             8.568099021911621,  0.8337112069129944, 69.23146057128906,
             3.8541641235351562, 70.5567398071289,   71.99264526367188
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -562,7 +562,7 @@ const reduceLogSumTests = [
             5.7273993492126465, 5.64375114440918, 5.453810214996338,
             5.758983135223389
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
index 5ba2e393077..e9a0b7b5493 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
@@ -34,7 +34,7 @@ const reduceLogSumExpTests = [
       'inputs': {
         'reduceLogSumExpInput': {
           'data': [0.7974132895469666],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -46,7 +46,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 0.7974132895469666,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -57,7 +57,7 @@ const reduceLogSumExpTests = [
       'inputs': {
         'reduceLogSumExpInput': {
           'data': [0.7974132895469666],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -70,7 +70,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 0.7974132895469666,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -103,7 +103,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -134,7 +134,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -154,7 +154,7 @@ const reduceLogSumExpTests = [
             -9.963415145874023,  -5.991659641265869,   -6.180599689483643,
             -1.2336505651474,    -0.44234341382980347, -6.990072250366211
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -165,7 +165,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 1.1666961908340454,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const reduceLogSumExpTests = [
             1, 5, 7, 5, 7, 5, 4, 2, 1, 5, 8, 2,
             4, 1, 4, 5, 4, 8, 6, 2, 7, 7, 8, 5
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -191,7 +191,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 9.607237815856934,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -206,7 +206,7 @@ const reduceLogSumExpTests = [
             -6, -3, -5,  -1,  -9, -5, -1, -2, -10, -1, -5, -7,
             -7, -3, -10, -10, -8, -6, -2, -6, -1,  -9, -5, -2
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -217,7 +217,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 0.7001367211341858,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -237,7 +237,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -248,7 +248,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -268,7 +268,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -279,7 +279,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -299,7 +299,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -310,7 +310,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -330,7 +330,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -341,7 +341,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -361,7 +361,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -376,7 +376,7 @@ const reduceLogSumExpTests = [
             8.55212688446045, 3.985233783721924, 5.52872896194458,
             9.081488609313965, 6.996237754821777, 9.759706497192383
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -396,7 +396,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -411,7 +411,7 @@ const reduceLogSumExpTests = [
             4.66951847076416, 9.08117961883545, 8.533217430114746,
             9.270560264587402, 6.450263977050781, 8.917200088500977
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -431,7 +431,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -445,7 +445,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -465,7 +465,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -479,7 +479,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': [10.39477825164795],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -499,7 +499,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -513,7 +513,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': 10.39477825164795,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -533,7 +533,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -547,7 +547,7 @@ const reduceLogSumExpTests = [
       'expectedOutputs': {
         'reduceLogSumExpOutput': {
           'data': [10.39477825164795],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -568,7 +568,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -585,7 +585,7 @@ const reduceLogSumExpTests = [
             8.563796997070312, 5.500619411468506, 9.753945350646973,
             9.20864486694336
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -606,7 +606,7 @@ const reduceLogSumExpTests = [
             6.802876949310303,   5.234325408935547,   8.914905548095703,
             9.166799545288086,   5.717507362365723,   0.3255050778388977
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -623,7 +623,7 @@ const reduceLogSumExpTests = [
             8.563796997070312, 5.500619411468506, 9.753945350646973,
             9.20864486694336
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
index 709b25b0ad3..5096e553239 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
@@ -33,7 +33,7 @@ const reduceMaxTests = [
       'inputs': {
         'reduceMaxInput': {
           'data': [32.16658401489258],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -45,7 +45,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 32.16658401489258,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +56,7 @@ const reduceMaxTests = [
       'inputs': {
         'reduceMaxInput': {
           'data': [32.16658401489258],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -68,7 +68,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 32.16658401489258,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -88,7 +88,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -100,7 +100,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -120,7 +120,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -131,7 +131,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -151,7 +151,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -162,7 +162,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -182,7 +182,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -193,7 +193,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -213,7 +213,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -224,7 +224,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -244,7 +244,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -255,7 +255,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -275,7 +275,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -289,7 +289,7 @@ const reduceMaxTests = [
             90.42288208007812, 75.90379333496094, 94.99645233154297,
             96.55397033691406, 99.77313232421875, 20.253753662109375
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -309,7 +309,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -324,7 +324,7 @@ const reduceMaxTests = [
             62.504642486572266, 96.55397033691406, 99.77313232421875,
             -21.557384490966797, 94.99645233154297, 37.28493118286133
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -344,7 +344,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -357,7 +357,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -377,7 +377,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -390,7 +390,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': [99.77313232421875],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -410,7 +410,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -423,7 +423,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': 99.77313232421875,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -443,7 +443,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -456,7 +456,7 @@ const reduceMaxTests = [
       'expectedOutputs': {
         'reduceMaxOutput': {
           'data': [99.77313232421875],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -477,7 +477,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -494,7 +494,7 @@ const reduceMaxTests = [
             90.42288208007812, 94.99645233154297, 96.55397033691406,
             99.77313232421875
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -515,7 +515,7 @@ const reduceMaxTests = [
             -72.86485290527344,  -46.03200912475586, 20.253753662109375,
             -21.557384490966797, -51.28727340698242, -42.58832931518555
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -532,7 +532,7 @@ const reduceMaxTests = [
             90.42288208007812, 94.99645233154297, 96.55397033691406,
             99.77313232421875
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
index 21fa1a5102c..ee5bf3673c0 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
@@ -33,7 +33,7 @@ const reduceMeanTests = [
       'inputs': {
         'reduceMeanInput': {
           'data': [95.84498596191406],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -45,7 +45,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 95.84498596191406,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +56,7 @@ const reduceMeanTests = [
       'inputs': {
         'reduceMeanInput': {
           'data': [95.84498596191406],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -68,7 +68,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 95.84498596191406,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -89,7 +89,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -101,7 +101,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -121,7 +121,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -132,7 +132,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -152,7 +152,7 @@ const reduceMeanTests = [
             -21.981258392333984, -61.31269454956055,  -58.598960876464844,
             -76.02980041503906,  -23.91740608215332,  -22.94187355041504
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -163,7 +163,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': -34.74319839477539,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -178,7 +178,7 @@ const reduceMeanTests = [
             42, 24, 44, 38, 82, 93, 64, 40, 48, 78, 81, 59,
             45, 18, 3,  77, 60, 19, 66, 8,  21, 19, 62, 71
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -189,7 +189,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 48.41666793823242,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -204,7 +204,7 @@ const reduceMeanTests = [
             -73, -8,  -55, -73, -61, -54, -5,  -39, -66, -53, -57, -39,
             -62, -98, -36, -1,  -75, -8,  -71, -72, -67, -16, -21, -31
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -215,7 +215,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': -47.54166793823242,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -235,7 +235,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -246,7 +246,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -266,7 +266,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -277,7 +277,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -297,7 +297,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -308,7 +308,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -328,7 +328,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -339,7 +339,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -359,7 +359,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -373,7 +373,7 @@ const reduceMeanTests = [
             45.46687316894531, 49.670711517333984, 50.94768142700195,
             44.734745025634766, 27.777833938598633, 23.264999389648438
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -393,7 +393,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -408,7 +408,7 @@ const reduceMeanTests = [
             54.82453536987305, 40.251548767089844, 22.060470581054688,
             48.58541488647461, 51.343353271484375, 24.797523498535156
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -428,7 +428,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -441,7 +441,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -461,7 +461,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': [40.31047439575195],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -494,7 +494,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -507,7 +507,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': 40.31047439575195,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -527,7 +527,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -540,7 +540,7 @@ const reduceMeanTests = [
       'expectedOutputs': {
         'reduceMeanOutput': {
           'data': [40.31047439575195],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -561,7 +561,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -578,7 +578,7 @@ const reduceMeanTests = [
             52.287559509277344, 45.10261917114258, 47.640018463134766,
             16.211700439453125
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -599,7 +599,7 @@ const reduceMeanTests = [
             58.56523132324219,  28.673492431640625, 42.13419723510742,
             21.63775062561035,  14.160697937011719, 15.127351760864258
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -616,7 +616,7 @@ const reduceMeanTests = [
             52.287559509277344, 45.10261917114258, 47.640018463134766,
             16.211700439453125
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
index 6cc38d6a078..7a5989045db 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
@@ -33,7 +33,7 @@ const reduceMinTests = [
       'inputs': {
         'reduceMinInput': {
           'data': [-58.76195526123047],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -45,7 +45,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -58.76195526123047,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +56,7 @@ const reduceMinTests = [
       'inputs': {
         'reduceMinInput': {
           'data': [-58.76195526123047],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -68,7 +68,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -58.76195526123047,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -88,7 +88,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -100,7 +100,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -120,7 +120,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -131,7 +131,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -151,7 +151,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -162,7 +162,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -182,7 +182,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -193,7 +193,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -213,7 +213,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -224,7 +224,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -244,7 +244,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -255,7 +255,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -275,7 +275,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -289,7 +289,7 @@ const reduceMinTests = [
             -87.9623031616211, -39.50931167602539, -53.747413635253906,
             -31.713542938232422, -84.4076919555664, -55.97655487060547
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -309,7 +309,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -324,7 +324,7 @@ const reduceMinTests = [
             -58.76195526123047, -87.9623031616211, -70.13690185546875,
             -59.40851974487305, -84.4076919555664, -53.747413635253906
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -344,7 +344,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -357,7 +357,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -377,7 +377,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -390,7 +390,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': [-87.9623031616211],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -410,7 +410,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -423,7 +423,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': -87.9623031616211,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -443,7 +443,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -456,7 +456,7 @@ const reduceMinTests = [
       'expectedOutputs': {
         'reduceMinOutput': {
           'data': [-87.9623031616211],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -477,7 +477,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -494,7 +494,7 @@ const reduceMinTests = [
             -87.9623031616211, -53.747413635253906, -84.4076919555664,
             -55.97655487060547
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -515,7 +515,7 @@ const reduceMinTests = [
             -59.40851974487305,  -84.4076919555664,  75.88834381103516,
             96.02651977539062,   -55.97655487060547, -1.7911018133163452
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -532,7 +532,7 @@ const reduceMinTests = [
             -87.9623031616211, -53.747413635253906, -84.4076919555664,
             -55.97655487060547
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
index 745f83b3cea..1a2e23c4f76 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
@@ -34,7 +34,7 @@ const reduceProductTests = [
       'inputs': {
         'reduceProductInput': {
           'data': [-68.75911712646484],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -46,7 +46,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': -68.75911712646484,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -57,7 +57,7 @@ const reduceProductTests = [
       'inputs': {
         'reduceProductInput': {
           'data': [-68.75911712646484],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -70,7 +70,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': -68.75911712646484,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -90,7 +90,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -102,7 +102,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -122,7 +122,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -133,7 +133,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -153,7 +153,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -164,7 +164,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -184,7 +184,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -195,7 +195,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -215,7 +215,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -226,7 +226,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -246,7 +246,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -257,7 +257,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -277,7 +277,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -292,7 +292,7 @@ const reduceProductTests = [
             7519895, -1292816.375, 2441721.75, -110637.7734375, -7380313.5,
             -818030.5
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -312,7 +312,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -327,7 +327,7 @@ const reduceProductTests = [
             4227263.5, -446960.5625, 3811296.75, 1280298.5, -1343475.375,
             1280118.75
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -361,7 +361,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -381,7 +381,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -394,7 +394,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': [1.5855958784642327e+37],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -414,7 +414,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -428,7 +428,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': 1.5855958784642327e+37,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -448,7 +448,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -461,7 +461,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': [1.5855958784642327e+37],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -482,7 +482,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -496,7 +496,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': [-3638925568, 6523364352, -414643360, 1610916352],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -517,7 +517,7 @@ const reduceProductTests = [
             -85.19523620605469, -18.16986083984375,  64.83759307861328,
             -14.95883846282959, -74.50932312011719,  -11.319679260253906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -531,7 +531,7 @@ const reduceProductTests = [
       'expectedOutputs': {
         'reduceProductOutput': {
           'data': [-3638925568, 6523364352, -414643360, 1610916352],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
index 9aec31d3f68..6b918027455 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
@@ -33,7 +33,7 @@ const reduceSumTests = [
       'inputs': {
         'reduceSumInput': {
           'data': [69.6038589477539],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -45,7 +45,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 69.6038589477539,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -56,7 +56,7 @@ const reduceSumTests = [
       'inputs': {
         'reduceSumInput': {
           'data': [69.6038589477539],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -68,7 +68,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 69.6038589477539,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -88,7 +88,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -100,7 +100,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -120,7 +120,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -131,7 +131,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -151,7 +151,7 @@ const reduceSumTests = [
             -96.29924774169922,  -68.46700286865234,  -26.107192993164062,
             -68.0182113647461,   -4.8330769538879395, -48.900699615478516
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -162,7 +162,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': -1163.642578125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -176,7 +176,7 @@ const reduceSumTests = [
             56, 90, 67, 33, 20, 58, 22, 15, 86, 79, 59, 99,
             16, 95, 67, 11, 60, 89, 50, 57, 77, 89, 10, 2
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -185,10 +185,8 @@ const reduceSumTests = [
         'outputs': 'reduceSumOutput'
       }],
       'expectedOutputs': {
-        'reduceSumOutput': {
-          'data': 1307,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceSumOutput':
+            {'data': 1307, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -201,7 +199,7 @@ const reduceSumTests = [
             -55, -36, -74, -17, -67, -95, -3,  -67, -95, -13, -45, -9,
             -33, -98, -86, -11, -70, -44, -31, -68, -79, -24, -60, -36
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -210,10 +208,8 @@ const reduceSumTests = [
         'outputs': 'reduceSumOutput'
       }],
       'expectedOutputs': {
-        'reduceSumOutput': {
-          'data': -1216,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceSumOutput':
+            {'data': -1216, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -232,7 +228,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -243,7 +239,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -263,7 +259,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -274,7 +270,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -294,7 +290,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -305,7 +301,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -325,7 +321,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +332,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -356,7 +352,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -370,7 +366,7 @@ const reduceSumTests = [
             210.44241333007812, 104.54179382324219, 226.2177734375,
             239.025390625, 260.405029296875, 273.2470397949219
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -390,7 +386,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -405,7 +401,7 @@ const reduceSumTests = [
             179.63900756835938, 260.37457275390625, 219.3611297607422,
             246.83712768554688, 157.4895782470703, 250.1780242919922
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -425,7 +421,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -438,7 +434,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -458,7 +454,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -471,7 +467,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': [1313.87939453125],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -491,7 +487,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -504,7 +500,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': 1313.87939453125,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -524,7 +520,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -537,7 +533,7 @@ const reduceSumTests = [
       'expectedOutputs': {
         'reduceSumOutput': {
           'data': [1313.87939453125],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -558,7 +554,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -575,7 +571,7 @@ const reduceSumTests = [
             355.21942138671875, 185.98255920410156, 362.3598937988281,
             410.3175354003906
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -596,7 +592,7 @@ const reduceSumTests = [
             35.54289627075195, 42.856414794921875, 88.58631896972656,
             98.85772705078125, 25.626853942871094, 60.1761360168457
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -613,7 +609,7 @@ const reduceSumTests = [
             355.21942138671875, 185.98255920410156, 362.3598937988281,
             410.3175354003906
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_sum_square.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_sum_square.https.any.js
index 10930c44c6e..0f92d817e61 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_sum_square.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_sum_square.https.any.js
@@ -34,7 +34,7 @@ const reduceSumSquareTests = [
       'inputs': {
         'reduceSumSquareInput': {
           'data': [52.5615348815918],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -46,7 +46,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 2762.71484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -57,7 +57,7 @@ const reduceSumSquareTests = [
       'inputs': {
         'reduceSumSquareInput': {
           'data': [52.5615348815918],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'},
+          'descriptor': {shape: [], dataType: 'float32'},
           'constant': true
         }
       },
@@ -70,7 +70,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 2762.71484375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -103,7 +103,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -134,7 +134,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -154,7 +154,7 @@ const reduceSumSquareTests = [
             -98.22420501708984,    -60.272953033447266, -74.73202514648438,
             -8.543684005737305,    -59.888736724853516, -17.99894142150879
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -165,7 +165,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 80052.015625,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const reduceSumSquareTests = [
             52, 48, 2,  66, 30, 39, 14, 23, 81, 94, 78, 64,
             38, 16, 63, 11, 46, 95, 17, 47, 40, 53, 87, 43
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -189,10 +189,8 @@ const reduceSumSquareTests = [
         'outputs': 'reduceSumSquareOutput'
       }],
       'expectedOutputs': {
-        'reduceSumSquareOutput': {
-          'data': 71347,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceSumSquareOutput':
+            {'data': 71347, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -206,7 +204,7 @@ const reduceSumSquareTests = [
             -10, -60, -69, -88, -35, -84, -74, -42, -93, -26, -40, -55,
             -92, -26, -39, -30, -61, -16, -16, -36, -9,  -89, -45, -29
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -215,10 +213,8 @@ const reduceSumSquareTests = [
         'outputs': 'reduceSumSquareOutput'
       }],
       'expectedOutputs': {
-        'reduceSumSquareOutput': {
-          'data': 73634,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
-        }
+        'reduceSumSquareOutput':
+            {'data': 73634, 'descriptor': {shape: [], dataType: 'float32'}}
       }
     }
   },
@@ -226,10 +222,8 @@ const reduceSumSquareTests = [
     'name': 'reduceSumSquare float32 1D tensor with empty axes',
     'graph': {
       'inputs': {
-        'reduceSumSquareInput': {
-          'data': [2, 3],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'}
-        }
+        'reduceSumSquareInput':
+            {'data': [2, 3], 'descriptor': {shape: [2], dataType: 'float32'}}
       },
       'operators': [{
         'name': 'reduceSumSquare',
@@ -238,10 +232,8 @@ const reduceSumSquareTests = [
         'outputs': 'reduceSumSquareOutput'
       }],
       'expectedOutputs': {
-        'reduceSumSquareOutput': {
-          'data': [4, 9],
-          'descriptor': {'dimensions': [2], 'dataType': 'float32'}
-        }
+        'reduceSumSquareOutput':
+            {'data': [4, 9], 'descriptor': {shape: [2], dataType: 'float32'}}
       }
     }
   },
@@ -260,7 +252,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -271,7 +263,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -291,7 +283,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -302,7 +294,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -322,7 +314,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -333,7 +325,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -353,7 +345,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -364,7 +356,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -384,7 +376,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -399,7 +391,7 @@ const reduceSumSquareTests = [
             9709.013671875, 10817.7685546875, 14548.470703125, 16385.8515625,
             9287.357421875, 12527.3974609375
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -419,7 +411,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -434,7 +426,7 @@ const reduceSumSquareTests = [
             8585.87109375, 7700.654296875, 19889.1796875, 7113.0439453125,
             16775.708984375, 13211.3994140625
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       }
     }
@@ -454,7 +446,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -468,7 +460,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -488,7 +480,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -502,7 +494,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': [73275.859375],
-          'descriptor': {'dimensions': [1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -522,7 +514,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -536,7 +528,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': 73275.859375,
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -556,7 +548,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -570,7 +562,7 @@ const reduceSumSquareTests = [
       'expectedOutputs': {
         'reduceSumSquareOutput': {
           'data': [73275.859375],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -591,7 +583,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -607,7 +599,7 @@ const reduceSumSquareTests = [
           'data': [
             12302.474609375, 22772.77734375, 26919.09765625, 11281.5068359375
           ],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
         }
       }
     }
@@ -628,7 +620,7 @@ const reduceSumSquareTests = [
             6.654552936553955,  85.79743957519531,  89.91349029541016,
             53.55647277832031,  39.48537063598633,  3.9460408687591553
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -644,7 +636,7 @@ const reduceSumSquareTests = [
           'data': [
             12302.474609375, 22772.77734375, 26919.09765625, 11281.5068359375
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
index 45388383fff..ea7fd9b9552 100644
--- a/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
@@ -13,14 +13,6 @@
 //
 // MLOperand relu(MLOperand input);
 
-
-const getReluPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 0, float16: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const reluTests = [
   {
     'name': 'relu float32 1D constant tensor',
@@ -37,7 +29,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -74,7 +66,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -85,7 +77,7 @@ const reluTests = [
       'inputs': {
         'reluInput': {
           'data': [79.04724884033203],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -98,7 +90,7 @@ const reluTests = [
           'data': [
             79.04724884033203,
           ],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -118,7 +110,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -154,7 +146,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -174,7 +166,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -210,7 +202,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -230,7 +222,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -266,7 +258,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -286,7 +278,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -322,7 +314,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -342,7 +334,7 @@ const reluTests = [
             51.51447296142578,  -51.63370132446289,  -64.56800079345703,
             -5.093302249908447, 15.354103088378906,  90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -378,7 +370,7 @@ const reluTests = [
             15.354103088378906,
             90.03858947753906
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -387,8 +379,7 @@ const reluTests = [
 
 if (navigator.ml) {
   reluTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getReluPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/resample2d.https.any.js b/tests/wpt/tests/webnn/conformance_tests/resample2d.https.any.js
index 65faca22abd..c10b4182ec0 100644
--- a/tests/wpt/tests/webnn/conformance_tests/resample2d.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/resample2d.https.any.js
@@ -70,7 +70,7 @@ const resample2dTests = [
             62.06375503540039,  1.7712159156799316, 99.4723129272461,
             11.440549850463867, 25.396343231201172, 67.0217514038086
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -90,7 +90,7 @@ const resample2dTests = [
             62.06375503540039,  1.7712159156799316, 99.4723129272461,
             11.440549850463867, 25.396343231201172, 67.0217514038086
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -104,7 +104,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -125,7 +125,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -139,7 +139,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -175,7 +175,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -198,7 +198,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -212,7 +212,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -235,7 +235,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 4, 6, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 6, 1], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -273,7 +273,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -288,7 +288,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -311,7 +311,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -326,7 +326,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -349,7 +349,7 @@ const resample2dTests = [
             90.7006607055664,  90.7006607055664,  86.95105743408203,
             86.95105743408203, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -364,7 +364,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -387,7 +387,7 @@ const resample2dTests = [
             90.7006607055664,   89.76325988769531,  87.88845825195312,
             84.9883041381836,   81.06280517578125,  79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -402,7 +402,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -425,7 +425,7 @@ const resample2dTests = [
             90.7006607055664,   89.76325988769531,  87.88845825195312,
             84.9883041381836,   81.06280517578125,  79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 1, 4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 4, 6], dataType: 'float32'}
         }
       }
     }
@@ -440,7 +440,7 @@ const resample2dTests = [
             59.92947006225586, 41.98918914794922, 66.39534759521484,
             90.7006607055664, 86.95105743408203, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -463,7 +463,7 @@ const resample2dTests = [
             90.7006607055664,   89.76325988769531,  87.88845825195312,
             84.9883041381836,   81.06280517578125,  79.10005187988281
           ],
-          'descriptor': {'dimensions': [1, 4, 6, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 6, 1], dataType: 'float32'}
         }
       }
     }
@@ -477,7 +477,7 @@ const resample2dTests = [
             59.92947006225586, 90.7006607055664, 41.98918914794922,
             86.95105743408203, 66.39534759521484, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [3, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -500,7 +500,7 @@ const resample2dTests = [
             79.10005187988281, 79.10005187988281, 66.39534759521484,
             66.39534759521484, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [6, 4, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -514,7 +514,7 @@ const resample2dTests = [
             59.92947006225586, 90.7006607055664, 41.98918914794922,
             86.95105743408203, 66.39534759521484, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [3, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -537,7 +537,7 @@ const resample2dTests = [
             79.10005187988281, 79.10005187988281, 66.39534759521484,
             66.39534759521484, 79.10005187988281, 79.10005187988281
           ],
-          'descriptor': {'dimensions': [6, 4, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4, 1, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
index 212e93575bc..23a8675e13f 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
@@ -15,13 +15,6 @@
 //     MLOperand input, sequence<[EnforceRange] unsigned long> newShape);
 
 
-const getReshapePrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 0, float16: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const reshapeTests = [
   {
     'name': 'reshape float32 tensor to a new shape (reorder all dimensions)',
@@ -38,7 +31,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -58,7 +51,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -78,7 +71,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -98,7 +91,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 6], dataType: 'float32'}
         }
       }
     }
@@ -118,7 +111,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -138,7 +131,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3, 1], dataType: 'float32'}
         }
       }
     }
@@ -158,7 +151,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -178,7 +171,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 2, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 3, 1], dataType: 'float32'}
         }
       }
     }
@@ -198,7 +191,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [3, 2, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -218,7 +211,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -238,7 +231,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -258,7 +251,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -278,7 +271,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -298,7 +291,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -318,7 +311,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -338,7 +331,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -358,7 +351,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 4, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 1, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -378,7 +371,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -389,7 +382,7 @@ const reshapeTests = [
       'inputs': {
         'reshapeInput': {
           'data': [-33.82555389404297],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -400,7 +393,7 @@ const reshapeTests = [
       'expectedOutputs': {
         'reshapeOutput': {
           'data': [-33.82555389404297],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -421,7 +414,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 1, 1, 24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 24, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -441,7 +434,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -461,7 +454,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -481,7 +474,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -502,7 +495,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [24, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -522,7 +515,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -543,7 +536,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 4, 6, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 6, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -563,7 +556,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -584,7 +577,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 1, 1, 12, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 1, 12, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -604,7 +597,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 12, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12, 1], dataType: 'float32'}
         }
       }
     }
@@ -625,7 +618,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 1, 1, 24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 24, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -645,7 +638,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       }
     }
@@ -656,7 +649,7 @@ const reshapeTests = [
       'inputs': {
         'reshapeInput': {
           'data': [-33.82555389404297],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -667,7 +660,7 @@ const reshapeTests = [
       'expectedOutputs': {
         'reshapeOutput': {
           'data': [-33.82555389404297],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -687,7 +680,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -707,7 +700,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       }
     }
@@ -727,7 +720,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -747,7 +740,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24, 1], dataType: 'float32'}
         }
       }
     }
@@ -767,7 +760,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -788,7 +781,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 1, 1, 24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 24, 1], dataType: 'float32'}
         }
       }
     }
@@ -809,7 +802,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -829,7 +822,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [24, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -849,7 +842,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -869,7 +862,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 6], dataType: 'float32'}
         }
       }
     }
@@ -889,7 +882,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -909,7 +902,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 4, 1, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 1, 6], dataType: 'float32'}
         }
       }
     }
@@ -929,7 +922,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -949,7 +942,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       }
     }
@@ -970,7 +963,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -990,7 +983,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 4, 6, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 4, 6, 1], dataType: 'float32'}
         }
       }
     }
@@ -1011,7 +1004,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 12, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1032,7 +1025,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 1, 1, 12, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 1, 12, 1], dataType: 'float32'}
         }
       }
     }
@@ -1052,7 +1045,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1072,7 +1065,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 1, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -1092,7 +1085,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 3, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1113,8 +1106,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor':
-              {'dimensions': [2, 1, 4, 1, 3, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3, 1], dataType: 'float32'}
         }
       }
     }
@@ -1134,7 +1126,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1154,7 +1146,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 12], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 12], dataType: 'float32'}
         }
       }
     }
@@ -1174,7 +1166,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1194,7 +1186,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -1214,7 +1206,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1234,7 +1226,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [1, 24], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 24], dataType: 'float32'}
         }
       }
     }
@@ -1254,7 +1246,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -1274,7 +1266,7 @@ const reshapeTests = [
             -96.93603515625,    65.34143829345703,   34.835994720458984,
             62.01485824584961,  -2.8698415756225586, 27.903749465942383
           ],
-          'descriptor': {'dimensions': [24, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [24, 1], dataType: 'float32'}
         }
       }
     }
@@ -1284,7 +1276,7 @@ const reshapeTests = [
 if (navigator.ml) {
   reshapeTests.forEach((test) => {
     webnn_conformance_test(
-        buildGraphAndCompute, getReshapePrecisionTolerance, test);
+        buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/scatterND.https.any.js b/tests/wpt/tests/webnn/conformance_tests/scatterND.https.any.js
new file mode 100644
index 00000000000..002ee3e4914
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/scatterND.https.any.js
@@ -0,0 +1,100 @@
+// META: title=test WebNN API scatterND operation
+// META: global=window,dedicatedworker
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+const getScatterNDPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 0};
+};
+
+const scatterNDTests = [
+  {
+    'name': 'Insert individual elements in a tensor by index',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [1, 2, 3, 4, 5, 6, 7, 8],
+          'descriptor': {shape: [8], dataType: 'float32'}
+        },
+        'indices': {
+          'data': [4, 3, 1, 7],
+          'descriptor': {shape: [4, 1], dataType: 'int32'},
+        },
+        'updates': {
+          'data': [9, 10, 11, 12],
+          'descriptor': {shape: [4], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'scatterND',
+        'arguments': [
+          {'input': 'input'}, {'indices': 'indices'}, {'updates': 'updates'}
+        ],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [1, 11, 3, 10, 9, 6, 7, 12],
+          'descriptor': {shape: [8], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'Insert entire slices of a higher rank tensor',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6,
+            7, 8, 8, 7, 6, 5, 4, 3, 2, 1, 8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4,
+            5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 7, 8,
+          ],
+          'descriptor': {shape: [4, 4, 4], dataType: 'float32'}
+        },
+        'indices': {
+          'data': [0, 2],
+          'descriptor': {shape: [2, 1], dataType: 'int32'},
+        },
+        'updates': {
+          'data': [
+            5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
+            1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4
+          ],
+          'descriptor': {shape: [2, 4, 4], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'scatterND',
+        'arguments': [
+          {'input': 'input'}, {'indices': 'indices'}, {'updates': 'updates'}
+        ],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 1, 2, 3, 4, 5, 6,
+            7, 8, 8, 7, 6, 5, 4, 3, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+            4, 4, 4, 4, 8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 7, 8
+          ],
+          'descriptor': {shape: [4, 4, 4], dataType: 'float32'}
+        }
+      }
+    }
+  }
+];
+
+if (navigator.ml) {
+  scatterNDTests.forEach((test) => {
+    webnn_conformance_test(
+        buildGraphAndCompute, getScatterNDPrecisionTolerance, test);
+  });
+} else {
+  test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
+}
diff --git a/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
index 5bcdb39969c..2149de9573a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
@@ -14,15 +14,6 @@
 //
 // MLOperand sigmoid(MLOperand input);
 
-
-const getSigmoidPrecisionTolerance = (graphResources) => {
-  // float32 (leaving a few ULP for roundoff)
-  const toleranceValueDict = {float32: 32 + 2, float16: 3};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const sigmoidTests = [
   {
     'name': 'sigmoid float32 1D constant tensor',
@@ -39,7 +30,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -60,7 +51,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -71,7 +62,7 @@ const sigmoidTests = [
       'inputs': {
         'sigmoidInput': {
           'data': [-0.37699514627456665],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -82,7 +73,7 @@ const sigmoidTests = [
       'expectedOutputs': {
         'sigmoidOutput': {
           'data': [0.4068518280982971],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -102,7 +93,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -122,7 +113,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -142,7 +133,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -162,7 +153,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -182,7 +173,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -202,7 +193,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -222,7 +213,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -242,7 +233,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -262,7 +253,7 @@ const sigmoidTests = [
             4.791460037231445,    2.0745489597320557,  0.8354471325874329,
             -5.433595657348633,   -4.184835910797119,  -2.484982490539551
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -282,7 +273,7 @@ const sigmoidTests = [
             0.9917680025100708,   0.8884047269821167,   0.6975054740905762,
             0.004348373040556908, 0.014996387995779514, 0.07691769301891327
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -291,8 +282,7 @@ const sigmoidTests = [
 
 if (navigator.ml) {
   sigmoidTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getSigmoidPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
index e00c6b70501..aad86854471 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
@@ -29,7 +29,7 @@ const signTests = [
             -0.946033775806427, 0.9996118545532227, 0.21998752653598785,
             -0.22639396786689758
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'},
+          'descriptor': {shape: [4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -41,7 +41,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 1, 1, -1],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       }
     }
@@ -55,7 +55,7 @@ const signTests = [
             -0.946033775806427, 0.9996118545532227, 0.21998752653598785,
             -0.22639396786689758
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float16'}
+          'descriptor': {shape: [4], dataType: 'float16'}
         }
       },
       'operators': [{
@@ -66,7 +66,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 1, 1, -1],
-          'descriptor': {'dimensions': [4], 'dataType': 'float16'}
+          'descriptor': {shape: [4], dataType: 'float16'}
         }
       }
     }
@@ -79,7 +79,7 @@ const signTests = [
           'data': [
             -0.946033775806427, 0.9996118545532227, 0.21998752653598785, 0.0
           ],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -90,7 +90,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 1, 1, 0],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       }
     }
@@ -101,7 +101,7 @@ const signTests = [
       'inputs': {
         'signInput': {
           'data': [-0.946033775806427, 0.9996118545532227, -Infinity, Infinity],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -112,7 +112,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 1, -1, 1],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'}
+          'descriptor': {shape: [4], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +123,7 @@ const signTests = [
       'inputs': {
         'signInput': {
           'data': [-1, 0, 1, 2],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2], dataType: 'int32'}
         }
       },
       'operators': [{
@@ -134,7 +134,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 0, 1, 1],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'int32'}
+          'descriptor': {shape: [2, 2], dataType: 'int32'}
         }
       }
     }
@@ -145,7 +145,7 @@ const signTests = [
       'inputs': {
         'signInput': {
           'data': [-1, 0, 1, 2, -2, -1, 0, 1],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'int64'}
         }
       },
       'operators': [{
@@ -156,7 +156,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 0, 1, 1, -1, -1, 0, 1],
-          'descriptor': {'dimensions': [2, 2, 2], 'dataType': 'int64'}
+          'descriptor': {shape: [2, 2, 2], dataType: 'int64'}
         }
       }
     }
@@ -167,7 +167,7 @@ const signTests = [
       'inputs': {
         'signInput': {
           'data': [-1, 0, 1, 2, -2, -1, 0, 1],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'int8'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'int8'}
         }
       },
       'operators': [{
@@ -178,7 +178,7 @@ const signTests = [
       'expectedOutputs': {
         'signOutput': {
           'data': [-1, 0, 1, 1, -1, -1, 0, 1],
-          'descriptor': {'dimensions': [1, 2, 2, 2], 'dataType': 'int8'}
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'int8'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/sin.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sin.https.any.js
index 30fc9a54f8f..d0dd150c6c2 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sin.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sin.https.any.js
@@ -28,7 +28,7 @@ const sinTests = [
       'inputs': {
         'sinInput': {
           'data': [79.78058624267578],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const sinTests = [
       'expectedOutputs': {
         'sinOutput': {
           'data': [-0.946033775806427],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const sinTests = [
             31.016063690185547, -94.88304901123047,  -84.58417510986328,
             44.8487434387207,   -19.000272750854492, -48.03827667236328
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const sinTests = [
             -0.38929200172424316, -0.59339439868927,    -0.23656263947486877,
             0.7620325684547424,   -0.15014687180519104, 0.7921885848045349
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/slice.https.any.js b/tests/wpt/tests/webnn/conformance_tests/slice.https.any.js
index 1c53d45fd5c..58604d2b8eb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/slice.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/slice.https.any.js
@@ -39,7 +39,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -57,7 +57,7 @@ const sliceTests = [
             -70.42774200439453, 59.82632064819336, -58.46095275878906,
             79.80570983886719, -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       }
     }
@@ -77,7 +77,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -94,7 +94,7 @@ const sliceTests = [
             -70.42774200439453, 59.82632064819336, -58.46095275878906,
             79.80570983886719, -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [12], 'dataType': 'float32'}
+          'descriptor': {shape: [12], dataType: 'float32'}
         }
       }
     }
@@ -114,7 +114,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -130,7 +130,7 @@ const sliceTests = [
             -27.306041717529297, -58.46095275878906, 79.80570983886719,
             -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [2, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 4], dataType: 'float32'}
         }
       }
     }
@@ -150,7 +150,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [4, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -166,7 +166,7 @@ const sliceTests = [
             57.4397087097168, -4.513182163238525, 74.02619171142578,
             -27.306041717529297, 79.80570983886719, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [3, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 2, 1], dataType: 'float32'}
         }
       }
     }
@@ -186,7 +186,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 2], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const sliceTests = [
       'expectedOutputs': {
         'sliceOutput': {
           'data': [-27.306041717529297, 42.665199279785156],
-          'descriptor': {'dimensions': [1, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const sliceTests = [
             -70.42774200439453,  59.82632064819336,  -58.46095275878906,
             79.80570983886719,   -9.857853889465332, 42.665199279785156
           ],
-          'descriptor': {'dimensions': [2, 2, 3, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 3, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -234,7 +234,7 @@ const sliceTests = [
       'expectedOutputs': {
         'sliceOutput': {
           'data': [-27.306041717529297, 42.665199279785156],
-          'descriptor': {'dimensions': [1, 2, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 1, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
index 28c0ff5ecac..a364f65ccc1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
@@ -13,19 +13,6 @@
 //
 // MLOperand softmax(MLOperand input, unsigned long axis);
 
-
-const getSoftmaxPrecisionTolerance = (graphResources) => {
-  const args = graphResources.operators[0].arguments;
-  const inputShape = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                         .descriptor.dimensions;
-  const axis = args.length === 2 ? args[1][Object.keys(args[1])[0]] : 1;
-  const tolerance = inputShape[axis] * 3 + 3;
-  const toleranceValueDict = {float32: tolerance, float16: tolerance};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const softmaxTests = [
   {
     'name': 'softmax float32 2D constant tensor all positive',
@@ -42,7 +29,7 @@ const softmaxTests = [
             1.6371468305587769, 0.27626121044158936, 5.02822732925415,
             3.8983259201049805, 2.8967113494873047,  6.88947057723999
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'},
+          'descriptor': {shape: [4, 6], dataType: 'float32'},
           'constant': true
         }
       },
@@ -67,7 +54,7 @@ const softmaxTests = [
             0.12633030116558075,    0.040812913328409195,
             0.014990009367465973,   0.8125221133232117
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -87,7 +74,7 @@ const softmaxTests = [
             1.6371468305587769, 0.27626121044158936, 5.02822732925415,
             3.8983259201049805, 2.8967113494873047,  6.88947057723999
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -111,7 +98,7 @@ const softmaxTests = [
             0.12633030116558075,    0.040812913328409195,
             0.014990009367465973,   0.8125221133232117
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -131,7 +118,7 @@ const softmaxTests = [
             -1.8421411514282227, -4.994808197021484,  -9.527292251586914,
             -4.985682964324951,  -8.421041488647461,  -6.235629558563232
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -151,7 +138,7 @@ const softmaxTests = [
             0.9090295433998108,   0.0388500951230526,    0.00041779119055718184,
             0.039206232875585556, 0.0012629841221496463, 0.011233373545110226
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -167,7 +154,7 @@ const softmaxTests = [
             0.5397239923477173, -0.9535139799118042, -0.5920282602310181,
             -0.17344485223293304, 0.14395014941692352, -0.37920907139778137
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'},
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -184,7 +171,7 @@ const softmaxTests = [
             0.5390242338180542, 0.16964708268642426, 0.142439603805542,
             0.22368484735488892, 0.36284899711608887, 0.3012755215167999
           ],
-          'descriptor': {'dimensions': [1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -200,7 +187,7 @@ const softmaxTests = [
             0.5397239923477173, -0.9535139799118042, -0.5920282602310181,
             -0.17344485223293304, 0.14395014941692352, -0.37920907139778137
           ],
-          'descriptor': {'dimensions': [3, 4, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 1, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -216,7 +203,7 @@ const softmaxTests = [
             0.33747196197509766, 0.07581108063459396, 0.17110128700733185,
             0.26004093885421753, 0.3571779429912567, 0.2116798311471939
           ],
-          'descriptor': {'dimensions': [3, 4, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 1, 1], dataType: 'float32'}
         }
       }
     }
@@ -225,8 +212,7 @@ const softmaxTests = [
 
 if (navigator.ml) {
   softmaxTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getSoftmaxPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
index 2b45700493e..0294172dd03 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
@@ -14,14 +14,6 @@
 //
 // MLOperand softplus(MLOperand input);
 
-
-const getSoftplusPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 18, float16: 18};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const softplusTests = [
   {
     'name': 'softplus float32 1D constant tensor',
@@ -38,7 +30,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -59,7 +51,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -70,7 +62,7 @@ const softplusTests = [
       'inputs': {
         'softplusInput': {
           'data': [5.626614570617676],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -81,7 +73,7 @@ const softplusTests = [
       'expectedOutputs': {
         'softplusOutput': {
           'data': [5.630208969116211],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -101,7 +93,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -121,7 +113,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -141,7 +133,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -161,7 +153,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -181,7 +173,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -201,7 +193,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -221,7 +213,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -241,7 +233,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -261,7 +253,7 @@ const softplusTests = [
             5.517927169799805,   7.192322254180908, 8.764925003051758,
             1.373470425605774,   8.930668830871582, 8.660283088684082
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -281,7 +273,7 @@ const softplusTests = [
             5.521933078765869,  7.1930742263793945, 8.765081405639648,
             1.5991919040679932, 8.930801391601562,  8.660456657409668
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -290,8 +282,7 @@ const softplusTests = [
 
 if (navigator.ml) {
   softplusTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getSoftplusPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
index 06560af48a5..344701e210a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
@@ -14,14 +14,6 @@
 //
 // MLOperand softsign(MLOperand input);
 
-
-const getSoftsignPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 3, float16: 3};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const softsignTests = [
   {
     'name': 'softsign positive float32 1D constant tensor',
@@ -38,7 +30,7 @@ const softsignTests = [
             7.816190242767334,  5.849185943603516, 8.780370712280273,
             5.120515823364258,  7.117222309112549, 4.599106788635254
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -59,7 +51,7 @@ const softsignTests = [
             0.8865723013877869,  0.8539972305297852, 0.8977543711662292,
             0.8366150856018066,  0.8768051266670227, 0.8214001059532166
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -70,7 +62,7 @@ const softsignTests = [
       'inputs': {
         'softsignInput': {
           'data': [1.5834133625030518],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -81,7 +73,7 @@ const softsignTests = [
       'expectedOutputs': {
         'softsignOutput': {
           'data': [0.6129152178764343],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -92,7 +84,7 @@ const softsignTests = [
       'inputs': {
         'softsignInput': {
           'data': [-2.597844123840332],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -103,7 +95,7 @@ const softsignTests = [
       'expectedOutputs': {
         'softsignOutput': {
           'data': [-0.7220557928085327],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -123,7 +115,7 @@ const softsignTests = [
             7.816190242767334,  5.849185943603516, 8.780370712280273,
             5.120515823364258,  7.117222309112549, 4.599106788635254
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -143,7 +135,7 @@ const softsignTests = [
             0.8865723013877869,  0.8539972305297852, 0.8977543711662292,
             0.8366150856018066,  0.8768051266670227, 0.8214001059532166
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -163,7 +155,7 @@ const softsignTests = [
             -3.5247786045074463, -4.43991231918335,   -5.234262466430664,
             -1.5911732912063599, -9.106277465820312,  -8.523774147033691
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -183,7 +175,7 @@ const softsignTests = [
             -0.7789947390556335, -0.8161734938621521, -0.8395960927009583,
             -0.6140744686126709, -0.9010515809059143, -0.894999623298645
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -203,7 +195,7 @@ const softsignTests = [
             3.0513505935668945,  7.426476955413818,   -8.454667091369629,
             7.135868072509766,   -4.986093997955322,  -7.859614849090576
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -223,7 +215,7 @@ const softsignTests = [
             0.7531687617301941,  0.88132643699646,     -0.8942321538925171,
             0.8770874738693237,  -0.8329461812973022,  -0.8871282935142517
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -243,7 +235,7 @@ const softsignTests = [
             3.0513505935668945,  7.426476955413818,   -8.454667091369629,
             7.135868072509766,   -4.986093997955322,  -7.859614849090576
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -263,7 +255,7 @@ const softsignTests = [
             0.7531687617301941,  0.88132643699646,     -0.8942321538925171,
             0.8770874738693237,  -0.8329461812973022,  -0.8871282935142517
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -283,7 +275,7 @@ const softsignTests = [
             3.0513505935668945,  7.426476955413818,   -8.454667091369629,
             7.135868072509766,   -4.986093997955322,  -7.859614849090576
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -303,7 +295,7 @@ const softsignTests = [
             0.7531687617301941,  0.88132643699646,     -0.8942321538925171,
             0.8770874738693237,  -0.8329461812973022,  -0.8871282935142517
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -323,7 +315,7 @@ const softsignTests = [
             3.0513505935668945,  7.426476955413818,   -8.454667091369629,
             7.135868072509766,   -4.986093997955322,  -7.859614849090576
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -343,7 +335,7 @@ const softsignTests = [
             0.7531687617301941,  0.88132643699646,     -0.8942321538925171,
             0.8770874738693237,  -0.8329461812973022,  -0.8871282935142517
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -352,8 +344,7 @@ const softsignTests = [
 
 if (navigator.ml) {
   softsignTests.forEach((test) => {
-    webnn_conformance_test(
-        buildGraphAndCompute, getSoftsignPrecisionTolerance, test);
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/split.https.any.js b/tests/wpt/tests/webnn/conformance_tests/split.https.any.js
index eee757f2976..461afce9ab9 100644
--- a/tests/wpt/tests/webnn/conformance_tests/split.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/split.https.any.js
@@ -46,13 +46,15 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 3}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 3}],
+        'outputs': ['splitOutput1', 'splitOutput2', 'splitOutput3']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
@@ -60,7 +62,7 @@ const splitTests = [
             -23.446075439453125, -85.64382934570312, 46.87752151489258,
             -68.11224365234375, 75.99607849121094
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -68,7 +70,7 @@ const splitTests = [
             84.16268920898438, -95.57494354248047, -52.40757751464844,
             -29.007186889648438, 71.65496063232422
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'splitOutput3': {
           'data': [
@@ -76,7 +78,7 @@ const splitTests = [
             65.1489486694336, -30.40681266784668, -6.818390369415283,
             46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       }
     }
@@ -96,12 +98,14 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 3}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 3}],
+        'outputs': ['splitOutput1', 'splitOutput2', 'splitOutput3']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
@@ -109,7 +113,7 @@ const splitTests = [
             -23.446075439453125, -85.64382934570312, 46.87752151489258,
             -68.11224365234375, 75.99607849121094
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -117,7 +121,7 @@ const splitTests = [
             84.16268920898438, -95.57494354248047, -52.40757751464844,
             -29.007186889648438, 71.65496063232422
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         },
         'splitOutput3': {
           'data': [
@@ -125,7 +129,7 @@ const splitTests = [
             65.1489486694336, -30.40681266784668, -6.818390369415283,
             46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       }
     }
@@ -145,12 +149,14 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [8, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [8, 3], dataType: 'float32'}
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 2}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 2}],
+        'outputs': ['splitOutput1', 'splitOutput2']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
@@ -159,7 +165,7 @@ const splitTests = [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -168,7 +174,7 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [4, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3], dataType: 'float32'}
         }
       }
     }
@@ -188,12 +194,14 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [4, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 2], dataType: 'float32'}
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 2}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 2}],
+        'outputs': ['splitOutput1', 'splitOutput2']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
@@ -202,7 +210,7 @@ const splitTests = [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -211,7 +219,7 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [2, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -231,40 +239,43 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [12, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 1, 1, 2], dataType: 'float32'}
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 4}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 4}],
+        'outputs':
+            ['splitOutput1', 'splitOutput2', 'splitOutput3', 'splitOutput4']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
             -64.52056884765625, -84.60513305664062, -67.99282836914062,
             -23.446075439453125, -85.64382934570312, 46.87752151489258
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput3': {
           'data': [
             -95.57494354248047, -52.40757751464844, -29.007186889648438,
             71.65496063232422, 50.66357421875, 21.364582061767578
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput4': {
           'data': [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -284,12 +295,14 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [6, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float32'}
         }
       },
-      'operators': [
-        {'name': 'split', 'arguments': [{'input': 'splitInput'}, {'splits': 2}]}
-      ],
+      'operators': [{
+        'name': 'split',
+        'arguments': [{'input': 'splitInput'}, {'splits': 2}],
+        'outputs': ['splitOutput1', 'splitOutput2']
+      }],
       'expectedOutputs': {
         'splitOutput1': {
           'data': [
@@ -298,7 +311,7 @@ const splitTests = [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -307,7 +320,7 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -327,12 +340,14 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [12, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 1, 1, 2], dataType: 'float32'}
         }
       },
       'operators': [{
         'name': 'split',
-        'arguments': [{'input': 'splitInput'}, {'splits': [3, 3, 3, 3]}]
+        'arguments': [{'input': 'splitInput'}, {'splits': [3, 3, 3, 3]}],
+        'outputs':
+            ['splitOutput1', 'splitOutput2', 'splitOutput3', 'splitOutput4'],
       }],
       'expectedOutputs': {
         'splitOutput1': {
@@ -340,28 +355,28 @@ const splitTests = [
             -64.52056884765625, -84.60513305664062, -67.99282836914062,
             -23.446075439453125, -85.64382934570312, 46.87752151489258
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput3': {
           'data': [
             -95.57494354248047, -52.40757751464844, -29.007186889648438,
             71.65496063232422, 50.66357421875, 21.364582061767578
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput4': {
           'data': [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [3, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -381,13 +396,15 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [12, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [12, 1, 1, 2], dataType: 'float32'}
         }
       },
       'operators': [{
         'name': 'split',
         'arguments':
-            [{'input': 'splitInput'}, {'splits': 3}, {'options': {'axis': 0}}]
+            [{'input': 'splitInput'}, {'splits': 3}, {'options': {'axis': 0}}],
+        'outputs': ['splitOutput1', 'splitOutput2', 'splitOutput3'],
+
       }],
       'expectedOutputs': {
         'splitOutput1': {
@@ -396,7 +413,7 @@ const splitTests = [
             -23.446075439453125, -85.64382934570312, 46.87752151489258,
             -68.11224365234375, 75.99607849121094
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -404,7 +421,7 @@ const splitTests = [
             84.16268920898438, -95.57494354248047, -52.40757751464844,
             -29.007186889648438, 71.65496063232422
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2], dataType: 'float32'}
         },
         'splitOutput3': {
           'data': [
@@ -412,7 +429,7 @@ const splitTests = [
             65.1489486694336, -30.40681266784668, -6.818390369415283,
             46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -432,14 +449,15 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [1, 1, 6, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 6, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
         'name': 'split',
         'arguments': [
           {'input': 'splitInput'}, {'splits': [3, 3]}, {'options': {'axis': 2}}
-        ]
+        ],
+        'outputs': ['splitOutput1', 'splitOutput2']
       }],
       'expectedOutputs': {
         'splitOutput1': {
@@ -449,7 +467,7 @@ const splitTests = [
             -68.11224365234375, 75.99607849121094, -61.05668640136719,
             -90.92643737792969, 53.916622161865234, 84.16268920898438
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 2, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -458,7 +476,7 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336, -30.40681266784668,
             -6.818390369415283, 46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [1, 1, 3, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 3, 2, 2], dataType: 'float32'}
         }
       }
     }
@@ -478,14 +496,15 @@ const splitTests = [
             -27.127241134643555, 65.1489486694336,   -30.40681266784668,
             -6.818390369415283,  46.673622131347656, -21.12453842163086
           ],
-          'descriptor': {'dimensions': [6, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float32'}
         }
       },
       'operators': [{
         'name': 'split',
         'arguments': [
           {'input': 'splitInput'}, {'splits': [2, 4]}, {'options': {'axis': 0}}
-        ]
+        ],
+        'outputs': ['splitOutput1', 'splitOutput2']
       }],
       'expectedOutputs': {
         'splitOutput1': {
@@ -494,7 +513,7 @@ const splitTests = [
             -23.446075439453125, -85.64382934570312, 46.87752151489258,
             -68.11224365234375, 75.99607849121094
           ],
-          'descriptor': {'dimensions': [2, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 1, 2, 2], dataType: 'float32'}
         },
         'splitOutput2': {
           'data': [
@@ -505,7 +524,7 @@ const splitTests = [
             -30.40681266784668, -6.818390369415283, 46.673622131347656,
             -21.12453842163086
           ],
-          'descriptor': {'dimensions': [4, 1, 1, 2, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 1, 1, 2, 2], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/sqrt.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sqrt.https.any.js
index aa24dc5501f..b6b13ec0759 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sqrt.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sqrt.https.any.js
@@ -28,7 +28,7 @@ const sqrtTests = [
       'inputs': {
         'sqrtInput': {
           'data': [4.0044636726379395],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const sqrtTests = [
       'expectedOutputs': {
         'sqrtOutput': {
           'data': [2.001115560531616],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const sqrtTests = [
             4.424484729766846,  0.09894099831581116, 4.6900248527526855,
             1.5277378559112549, 5.929779529571533,   6.066471576690674
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const sqrtTests = [
             2.1034460067749023, 0.31454887986183167, 2.165646553039551,
             1.2360169887542725, 2.4351139068603516,  2.4630208015441895
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
index c034cf7b0ad..3bb23caf5f5 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
@@ -36,7 +36,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputB': {
@@ -50,7 +50,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -71,7 +71,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -91,7 +91,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -104,7 +104,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -124,7 +124,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -144,7 +144,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -157,7 +157,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -177,7 +177,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -197,7 +197,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -210,7 +210,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +230,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -250,7 +250,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -263,7 +263,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -283,7 +283,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -303,7 +303,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -316,7 +316,7 @@ const subTests = [
             35.2364616394043,   -77.05516815185547,  -57.8714714050293,
             -58.15085983276367, 27.488866806030273,  31.99802017211914
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -336,7 +336,7 @@ const subTests = [
             45.33327102661133,   174.68115234375,     110.61997985839844,
             147.31689453125,     -47.992286682128906, 67.48905944824219
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -347,7 +347,7 @@ const subTests = [
       'inputs': {
         'inputA': {
           'data': [-97.04911804199219],
-          'descriptor': {'dimensions': [1], 'dataType': 'float32'}
+          'descriptor': {shape: [1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -360,7 +360,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -380,7 +380,7 @@ const subTests = [
             -177.6188507080078,  -194.67510986328125, -149.79762268066406,
             -186.21514892578125, -76.54570007324219,  -196.53619384765625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -400,14 +400,14 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             10.762838363647461, -90.23992156982422, 12.787367820739746,
             -62.44633865356445, 32.18257522583008, 20.359493255615234
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -427,7 +427,7 @@ const subTests = [
             69.80689239501953,  187.86590576171875,  39.96113967895508,
             151.6123809814453,  -52.68599319458008,  79.12757873535156
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -447,14 +447,14 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputB': {
           'data': [
             -8.39311408996582, 75.54753112792969, -32.325870513916016,
             8.088332176208496
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const subTests = [
             112.89559936523438,  129.9518585205078,   85.07437896728516,
             81.07770538330078,   -28.591751098632812, 91.39874267578125
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -485,7 +485,7 @@ const subTests = [
       'inputs': {
         'inputA': {
           'data': [-97.04911804199219],
-          'descriptor': {'dimensions': [1, 1, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
         },
         'inputB': {
           'data': [
@@ -498,7 +498,7 @@ const subTests = [
             80.56973266601562,   97.62598419189453, 52.74850845336914,
             89.1660385131836,    -20.50341796875,   99.48707580566406
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -518,7 +518,7 @@ const subTests = [
             -177.6188507080078,  -194.67510986328125, -149.79762268066406,
             -186.21514892578125, -76.54570007324219,  -196.53619384765625
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/subgraph.https.any.js b/tests/wpt/tests/webnn/conformance_tests/subgraph.https.any.js
new file mode 100644
index 00000000000..172c59a83b1
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/subgraph.https.any.js
@@ -0,0 +1,2475 @@
+// META: title=test WebNN API subgraph with multiple operations
+// META: global=window,dedicatedworker
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+const subgraphTests = [
+  {
+    'name': 'conv2d default + relu',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'relu',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5323282480239868, 1.3573521375656128, 1.3641656637191772,
+            1.071682333946228, 1.1259644031524658, 1.4713115692138672,
+            1.078782320022583, 1.155018925666809, 1.656954288482666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + relu / float16',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'relu',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + reshape / float16',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'reshape',
+          'arguments': [{'input': 'conv2dOutput'}, {'newShape': [9]}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [9], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'reshape + conv2d default/ float16',
+    'graph': {
+      'inputs': {
+        'reshapeInput': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [9], dataType: 'float16'},
+        },
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+      },
+      'operators': [
+        {
+          'name': 'reshape',
+          'arguments': [{'input': 'reshapeInput'}, {'newShape': [1, 1, 3, 3]}],
+          'outputs': 'reshapeOutput'
+        },
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'reshapeOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + sigmoid',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'sigmoid',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.8223466873168945, 0.7953290343284607, 0.7964358925819397,
+            0.7449167370796204, 0.7550933957099915, 0.8132566809654236,
+            0.7462635040283203, 0.7604264616966248, 0.83982872962951666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + clamp',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'clamp',
+          'arguments': [
+            {'input': 'conv2dOutput'},
+            {'options': {'minValue': 0, 'maxValue': 6}}
+          ],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5323282480239868, 1.3573521375656128, 1.3641656637191772,
+            1.071682333946228, 1.1259644031524658, 1.4713115692138672,
+            1.078782320022583, 1.155018925666809, 1.656954288482666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + leakyRelu',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'leakyRelu',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5323282480239868, 1.3573521375656128, 1.3641656637191772,
+            1.071682333946228, 1.1259644031524658, 1.4713115692138672,
+            1.078782320022583, 1.155018925666809, 1.656954288482666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + elu',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'elu',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5323282480239868, 1.3573521375656128, 1.3641656637191772,
+            1.071682333946228, 1.1259644031524658, 1.4713115692138672,
+            1.078782320022583, 1.155018925666809, 1.656954288482666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + prelu',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            -0.8073334693908691, -0.8839999437332153,  -0.7700487375259399,
+            -0.5646049380302429, -0.39717939496040344, -0.10841356962919235,
+            -0.5519214868545532, -0.3954172134399414,  -0.057589758187532425,
+            -0.5144240856170654, -0.21321901679039001, -0.950609028339386,
+            -0.8043696880340576, -0.8646378517150879,  -0.9607220888137817,
+            -0.3264438509941101, -0.06884296983480453, -0.3203399181365967,
+            -0.2692728042602539, -0.3430887758731842,  -0.8989502191543579,
+            -0.9038569331169128, -0.6369403004646301,  -0.20070797204971313,
+            -0.7870702147483826,
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        },
+        'preluSlope': {
+          'data': [
+            2,
+            3,
+            4,
+            -2,
+            -4,
+            -5,
+            8,
+            9,
+            1,
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        },
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'prelu',
+          'arguments': [{'input': 'conv2dOutput'}, {'slope': 'preluSlope'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -4.119449138641357, -6.7131500244140625, -8.318120002746582,
+            2.9565374851226807, 6.632988929748535, 8.277504920959473,
+            -15.338706970214844, -16.247453689575195, -2.055551290512085
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + hardSwish',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'hardSwish',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.157502485501543, 0.9857435818773853, 0.9922408563279537,
+            0.7272583864195519, 0.7742814812380979, 1.0964487730571852,
+            0.7333530675289874, 0.7998542619888367, 1.2860601012485775
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + gelu',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'gelu',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.436219573020935, 1.2388081550598145, 1.2464958429336548,
+            0.9195770025253296, 0.9794872999191284, 1.367431879043579,
+            0.9273834228515625, 1.0117487907409668, 1.5761539936065674
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + hardSigmoid',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'hardSigmoid',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.8064656598030677, 0.7714704363749472, 0.7728331393335313,
+            0.7143364781353666, 0.7251928745681375, 0.7942623204728064,
+            0.7157564698643701, 0.7310037880065647, 0.8313908649162249
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + linear',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'linear',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.5323282480239868, 1.3573522567749023, 1.3641656637191772,
+            1.0716824531555176, 1.1259644031524658, 1.4713115692138672,
+            1.078782320022583, 1.155018925666809, 1.656954288482666
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + softplus',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'softplus',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.727921485900879, 1.5863515138626099, 1.591774344444275,
+            1.366165280342102, 1.4068782329559326, 1.6780201196670532,
+            1.371458888053894, 1.4288948774337769, 1.8315116167068481
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + softsign',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'softsign',
+          'arguments': [{'input': 'conv2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.6051064941347312, 0.5757952470195913, 0.5770178031897163,
+            0.5173005261326311, 0.5296252313655604, 0.5953565713674431,
+            0.5189491577479364, 0.5359669553601377, 0.6236292092986385
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + relu',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'relu',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533400297165, 0.5446354150772095, 0.3565753698348999,
+            0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
+            0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + leakyRelu',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'leakyRelu',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533400297165, 0.5446354150772095, 0.3565753698348999,
+            0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
+            0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + sigmoid',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'sigmoid',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.5481882691383362, 0.6328900456428528, 0.588211178779602,
+            0.5449046492576599, 0.5692307949066162, 0.5387779474258423,
+            0.5012837648391724, 0.5194190144538879, 0.5002181529998779
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + softplus',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'softplus',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.7944898009300232, 1.0020939111709595, 0.8872446417808533,
+            0.7872483730316162, 0.8421828746795654, 0.7738757133483887,
+            0.6957180500030518, 0.7327595353126526, 0.693583607673645
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + clamp',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'clamp',
+          'arguments': [
+            {'input': 'convTranspose2dOutput'},
+            {'options': {'minValue': 0, 'maxValue': 6}}
+          ],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533329919328, 0.5446354056033407, 0.3565753786367729,
+            0.18010397583982396, 0.27871361683602214, 0.15542395985886007,
+            0.005135118987714682, 0.07771513366674958, 0.0008727149065748813
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + elu',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'elu',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533400297165, 0.5446354150772095, 0.3565753698348999,
+            0.18010397255420685, 0.2787136137485504, 0.15542395412921906,
+            0.0051351189613342285, 0.07771513611078262, 0.0008727149106562138
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + gelu',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'gelu',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.11149890720844269, 0.3850560784339905, 0.2279568910598755,
+            0.10292303562164307, 0.16995054483413696, 0.08731041103601456,
+            0.002578079467639327, 0.0412646159529686, 0.0004366612993180752
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + hardSigmoid',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'hardSigmoid',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.5386706590652466, 0.6089270710945129, 0.5713150501251221,
+            0.536020815372467, 0.5557427406311035, 0.5310847759246826,
+            0.5010270476341248, 0.5155430436134338, 0.5001745223999023
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + hardSwish',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'hardSwish',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.10290758311748505, 0.32175564765930176, 0.19947868585586548,
+            0.09545823186635971, 0.15230369567871094, 0.08173808455467224,
+            0.0025719543918967247, 0.03986417502164841, 0.00043648440623655915
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + linear',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'linear',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533329919328, 0.5446354056033407, 0.3565753786367729,
+            0.18010397583982396, 0.27871361683602214, 0.15542395985886007,
+            0.005135118987714682, 0.07771513366674958, 0.0008727149065748813
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + prelu',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'preluSlope': {
+          'data': [
+            2,
+            3,
+            4,
+            -2,
+            -4,
+            -5,
+            8,
+            9,
+            1,
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        },
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'prelu',
+          'arguments':
+              [{'input': 'convTranspose2dOutput'}, {'slope': 'preluSlope'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.1933533329919328, 0.5446354056033407, 0.3565753786367729,
+            0.18010397583982396, 0.27871361683602214, 0.15542395985886007,
+            0.005135118987714682, 0.07771513366674958, 0.0008727149065748813
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + softsign',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'softsign',
+          'arguments': [{'input': 'convTranspose2dOutput'}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.16202521324157715, 0.35259804129600525, 0.2628496587276459,
+            0.15261703729629517, 0.2179640680551529, 0.13451682031154633,
+            0.005108884070068598, 0.07211101800203323, 0.000871953961905092
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + relu',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'relu',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0,
+            31.068212509155273,
+            0,
+            1.4459478855133057,
+            22.170541763305664,
+            0,
+            0,
+            18.583200454711914,
+            0,
+            17.820920944213867,
+            16.2480411529541,
+            16.447195053100586,
+            11.57226848602295,
+            1.8526301383972168,
+            5.306026458740234,
+            24.145092010498047,
+            8.629376411437988,
+            0,
+            0,
+            34.203548431396484,
+            0,
+            18.671411514282227,
+            2.5159497261047363,
+            4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + leakyRelu',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'leakyRelu',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.04312741756439209,   31.068212509155273, -0.13910239934921265,
+            1.4459478855133057,     22.170541763305664, -0.06407354772090912,
+            -0.06995829194784164,   18.583200454711914, -0.1083112508058548,
+            17.820920944213867,     16.2480411529541,   16.447195053100586,
+            11.57226848602295,      1.8526301383972168, 5.306026458740234,
+            24.145092010498047,     8.629376411437988,  -0.0921698659658432,
+            -0.0019894775468856096, 34.203548431396484, -0.1692316085100174,
+            18.671411514282227,     2.5159497261047363, 4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + sigmoid',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'sigmoid',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.013219666667282581,
+            1,
+            9.09618108835275e-7,
+            0.8093740344047546,
+            1,
+            0.0016466662054881454,
+            0.0009148556273430586,
+            1,
+            0.000019773951862589456,
+            1,
+            0.9999999403953552,
+            0.9999999403953552,
+            0.9999905824661255,
+            0.864435613155365,
+            0.9950628876686096,
+            1,
+            0.9998212456703186,
+            0.00009932774992194027,
+            0.45042645931243896,
+            1,
+            4.4705895874130874e-8,
+            1,
+            0.9252524375915527,
+            0.992764949798584
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + clamp',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'clamp',
+          'arguments': [
+            {'input': 'bnOutput'}, {'options': {'minValue': 0, 'maxValue': 6}}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0,
+            6,
+            0,
+            1.4459478855133057,
+            6,
+            0,
+            0,
+            6,
+            0,
+            6,
+            6,
+            6,
+            6,
+            1.8526301383972168,
+            5.306026458740234,
+            6,
+            6,
+            0,
+            0,
+            6,
+            0,
+            6,
+            2.5159497261047363,
+            4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + prelu',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'preluSlope': {
+          'data': [
+            2, 3, 4, -2, -4, -5, 2, 3, 4, -2, -4, -5,
+            2, 3, 4, -2, -4, -5, 2, 3, 4, -2, -4, -5,
+
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'},
+        },
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'prelu',
+          'arguments': [{'input': 'bnOutput'}, {'slope': 'preluSlope'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -8.625483512878418,  31.068212509155273, -55.640960693359375,
+            1.4459478855133057,  22.170541763305664, 32.036773681640625,
+            -13.991658210754395, 18.583200454711914, -43.324501037597656,
+            17.820920944213867,  16.2480411529541,   16.447195053100586,
+            11.57226848602295,   1.8526301383972168, 5.306026458740234,
+            24.145092010498047,  8.629376411437988,  46.084930419921875,
+            -0.397895485162735,  34.203548431396484, -67.69264221191406,
+            18.671411514282227,  2.5159497261047363, 4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + elu',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'elu',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.9866032600402832,  31.068212509155273, -0.9999991059303284,
+            1.4459478855133057,   22.170541763305664, -0.9983506202697754,
+            -0.9990842938423157,  18.583200454711914, -0.9999802112579346,
+            17.820920944213867,   16.2480411529541,   16.447195053100586,
+            11.57226848602295,    1.8526301383972168, 5.306026458740234,
+            24.145092010498047,   8.629376411437988,  -0.9999006390571594,
+            -0.18040728569030762, 34.203548431396484, -0.9999999403953552,
+            18.671411514282227,   2.5159497261047363, 4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization options.axis=0 + gelu',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [-1, 0, 1, 2, 3, 4],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [0, 3, 6],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [1.0, 1.5, 2.0],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'},
+            {'variance': 'bnVariance'}, {'options': {'axis': 0}}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'gelu',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.15865567326545715, 0, -0.08366739749908447, -0.16910307109355927,
+            -0.03595117852091789, -0.1112278625369072
+          ],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + hardSigmoid',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'hardSigmoid',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0,
+            1,
+            0,
+            0.7891895771026611,
+            1,
+            0,
+            0,
+            1,
+            0,
+            1,
+            1,
+            1,
+            1,
+            0.8705260157585144,
+            1,
+            1,
+            1,
+            0,
+            0.4602104425430298,
+            1,
+            0,
+            1,
+            1,
+            1
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + hardSwish',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'hardSwish',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0,
+            31.068212509155273,
+            -0,
+            1.0714348554611206,
+            22.170541763305664,
+            -0,
+            -0,
+            18.583200454711914,
+            -0,
+            17.820920944213867,
+            16.2480411529541,
+            16.447195053100586,
+            11.57226848602295,
+            1.4983549118041992,
+            5.306026458740234,
+            24.145092010498047,
+            8.629376411437988,
+            -0,
+            -0.09287717193365097,
+            34.203548431396484,
+            -0,
+            18.671411514282227,
+            2.3129754066467285,
+            4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + linear',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'linear',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -4.312741756439209,  31.068212509155273, -13.910240173339844,
+            1.4459478855133057,  22.170541763305664, -6.407354354858398,
+            -6.995829105377197,  18.583200454711914, -10.831125259399414,
+            17.820920944213867,  16.2480411529541,   16.447195053100586,
+            11.57226848602295,   1.8526301383972168, 5.306026458740234,
+            24.145092010498047,  8.629376411437988,  -9.216986656188965,
+            -0.1989477425813675, 34.203548431396484, -16.923160552978516,
+            18.671411514282227,  2.5159497261047363, 4.921559810638428
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization options.axis=0 + softplus',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [-1, 0, 1, 2, 3, 4],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [0, 3, 6],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [1.0, 1.5, 2.0],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'},
+            {'variance': 'bnVariance'}, {'options': {'axis': 0}}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'softplus',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.31326302886009216, 0.6931471824645996, 0.17843490839004517,
+            0.3660161793231964, 0.11321607977151871, 0.21762241423130035
+          ],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization default + softsign',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.30733108520508,  64.08863830566406,    -63.376670837402344,
+            -46.790367126464844, 83.02227020263672,    -80.08049011230469,
+            -62.144378662109375, -0.10012771934270859, -40.90216064453125,
+            56.96306228637695,   37.37249755859375,    57.046478271484375,
+            82.05680084228516,   -86.1164321899414,    76.8831787109375,
+            97.03362274169922,   -21.35103988647461,   -96.93824005126953,
+            -9.359310150146484,  80.20824432373047,    -85.36802673339844,
+            62.35185241699219,   -68.4724349975586,    -12.10716724395752
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [
+            -7.814267635345459, -95.64129638671875, 38.15440368652344,
+            -55.95203399658203, -87.86500549316406, -41.63645553588867
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [
+            60.31186294555664, 26.43260383605957, 53.275634765625,
+            40.146121978759766, 59.41098403930664, 35.99981689453125
+          ],
+          'descriptor': {shape: [6], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'softsign',
+          'arguments': [{'input': 'bnOutput'}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.8117733001708984,  0.9688164591789246, -0.9329320192337036,
+            0.5911605358123779,   0.956841766834259,  -0.8649990558624268,
+            -0.8749347925186157,  0.9489358067512512, -0.9154771566390991,
+            0.9468676447868347,   0.9420223832130432, 0.9426842331886292,
+            0.9204598665237427,   0.6494463086128235, 0.8414215445518494,
+            0.960230827331543,    0.8961511254310608, -0.9021238088607788,
+            -0.16593527793884277, 0.9715937972068787, -0.9442062973976135,
+            0.9491648077964783,   0.7155818343162537, 0.8311256170272827
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d default + softmax',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6124474406242371,  0.8857858777046204,  0.13667134940624237,
+            0.5645291209220886,  0.8965172171592712,  0.36792829632759094,
+            0.6811466217041016,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+            0.4272463321685791,  0.535800576210022,   0.5910806059837341,
+            0.28415432572364807, 0.4147258698940277,  0.026906268671154976,
+            0.3621256649494171,  0.9945681691169739,  0.07184549421072006,
+            0.12204372137784958, 0.8422137498855591,  0.4537501037120819,
+            0.21529443562030792
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.3804761469364166, 0.5280312299728394, 0.21947036683559418,
+            0.36689770221710205, 0.33974137902259827, 0.4200059771537781,
+            0.3805030882358551, 0.19443586468696594, 0.5686976909637451
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'conv2dOutput'}, {'axis': 1}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [1, 1, 1, 1, 1, 1, 1, 1, 1],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d with options.inputLayout=\'nchw\' + softmax',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529087066650391, 0.7520291805267334, 0.5949527621269226,
+            0.2163185328245163, 0.07589349150657654, 0.151067852973938,
+            0.1212485060095787, 0.5364335179328918, 0.5937089920043945,
+            0.991003155708313, 0.3630942404270172, 0.9289674162864685,
+            0.22727376222610474, 0.5414124131202698, 0.08445341885089874,
+            0.6765284538269043, 0.6193256378173828, 0.3929215967655182
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float32'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.14543837308883667, 0.9671129584312439, 0.10836050659418106,
+            0.3202308118343353, 0.6952692270278931, 0.5070913434028625,
+            0.08139707148075104, 0.5303338766098022, 0.3072136342525482,
+            0.43241235613822937, 0.9849002361297607, 0.4281076192855835
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [
+        {
+          'name': 'conv2d',
+          'arguments': [
+            {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+            {'options': {'inputLayout': 'nchw'}}
+          ],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'conv2dOutput'}, {'axis': 1}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.3331032991409302,  0.324962317943573,   0.29539743065834045,
+            0.2717963457107544,  0.3601743280887604,  0.38498347997665405,
+            0.3584483861923218,  0.2951734662055969,  0.30672240257263184,
+            0.29005417227745056, 0.34615418314933777, 0.4330301880836487,
+            0.2580137252807617,  0.35141614079475403, 0.2865088880062103,
+            0.2349148392677307,  0.4192594587802887,  0.2807352542877197,
+            0.2830294668674469,  0.3250284790992737,  0.3227268159389496,
+            0.36784860491752625, 0.4304616451263428,  0.4400566816329956
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm default + softmax',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            82.98884582519531, 90.51641082763672, 59.638519287109375,
+            36.271873474121094, 18.9648494720459, 43.89479446411133,
+            98.89488220214844, 91.46013641357422, 50.51683807373047,
+            40.45679473876953, 50.76741409301758, 9.336554527282715
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float32'}
+        },
+        'inputB': {
+          'data': [
+            25.14739227294922,  66.6923828125,     63.29909896850586,
+            10.629964828491211, 61.32737731933594, 0.0037256532814353704,
+            16.4991455078125,   3.036668062210083, 93.14022064208984,
+            70.08265686035156,  75.74880981445312, 96.60688018798828,
+            99.10041809082031,  23.2437744140625,  86.11856842041016,
+            42.90679168701172,  34.08055114746094, 87.37654876708984,
+            92.34209442138672,  60.32209014892578
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'gemm',
+          'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+          'outputs': 'gemmOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'gemmOutput'}, {'axis': 1}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1],
+          'descriptor': {shape: [3, 5], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d default + softmax',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.5872158408164978, 0.6077792048454285, 0.017289165407419205,
+            0.2614607512950897
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.3292713165283203, 0.5866857171058655, 0.29701370000839233,
+            0.0033378428779542446
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'convTranspose2dOutput'}, , {'axis': 1}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [1, 1, 1, 1, 1, 1, 1, 1, 1],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d with options.inputLayout=nchw + softmax',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.05605664849281311, 0.7114229798316956, 0.6529743671417236,
+            0.38622909784317017, 0.3870837390422821, 0.9461629390716553,
+            0.09573192149400711, 0.9234652519226074, 0.636277973651886
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.8614422678947449, 0.6267672777175903, 0.6366490125656128,
+            0.8382642269134521, 0.11884837597608566, 0.9921330213546753,
+            0.3285411298274994, 0.8742373585700989, 0.7205492258071899,
+            0.9801966547966003, 0.06169835478067398, 0.3220160901546478,
+            0.7498031854629517, 0.3930714726448059, 0.13811933994293213,
+            0.28385090827941895, 0.4235861301422119, 0.1448512077331543
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [
+        {
+          'name': 'convTranspose2d',
+          'arguments': [
+            {'input': 'convTranspose2dInput'},
+            {'filter': 'convTranspose2dFilter'},
+            {'options': {'inputLayout': 'nchw'}}
+          ],
+          'outputs': 'convTranspose2dOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'convTranspose2dOutput'}, , {'axis': 1}],
+          'outputs': 'output'
+        },
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.49833576343872565, 0.4868008917870872,  0.5846997575195981,
+            0.6440102325142313,  0.551181906978995,   0.4897745354808822,
+            0.5547395504993903,  0.5345537346530161,  0.7474278654695712,
+            0.7016867653522572,  0.5063253693672739,  0.48246072443639854,
+            0.7623912436471291,  0.8061268489635616,  0.7996560653284985,
+            0.506431947475152,   0.5613868238161465,  0.5802700289121353,
+            0.7796113177719141,  0.7480226893035377,  0.5010695683288174,
+            0.521090376342132,   0.6223909030394784,  0.6938916162243012,
+            0.5905655851990261,  0.5016642365612743,  0.5131991082129128,
+            0.4153002424804018,  0.35598976748576877, 0.44881809302100495,
+            0.5102254645191179,  0.4452604495006097,  0.4654462653469838,
+            0.2525721345304288,  0.29831323464774284, 0.4936746306327262,
+            0.5175392755636015,  0.237608756352871,   0.19387315103643848,
+            0.20034393467150155, 0.493568052524848,   0.43861317618385354,
+            0.4197299710878647,  0.22038868222808597, 0.2519773106964624,
+            0.4989304316711825,  0.4789096236578681,  0.37760909696052153,
+            0.30610838377569893, 0.409434414800974
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization options.axis=0  + softmax',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [-1, 0, 1, 2, 3, 4],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        },
+        'bnMean': {
+          'data': [0, 3, 6],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        },
+        'bnVariance': {
+          'data': [1.0, 1.5, 2.0],
+          'descriptor': {shape: [3], dataType: 'float32'}
+        }
+      },
+      'operators': [
+        {
+          'name': 'batchNormalization',
+          'arguments': [
+            {'input': 'bnInput'}, {'mean': 'bnMean'},
+            {'variance': 'bnVariance'}, {'options': {'axis': 0}}
+          ],
+          'outputs': 'bnOutput'
+        },
+        {
+          'name': 'softmax',
+          'arguments': [{'input': 'bnOutput'}, {'axis': 1}],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [1, 1, 1, 1, 1, 1],
+          'descriptor': {shape: [3, 1, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+];
+
+if (navigator.ml) {
+  subgraphTests.forEach((test) => {
+    webnn_conformance_test(buildGraphAndCompute, getPrecisionTolerance, test);
+  });
+} else {
+  test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
+}
diff --git a/tests/wpt/tests/webnn/conformance_tests/tan.https.any.js b/tests/wpt/tests/webnn/conformance_tests/tan.https.any.js
index 5fcf0e68996..a8b6bba13c1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/tan.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/tan.https.any.js
@@ -28,7 +28,7 @@ const tanTests = [
       'inputs': {
         'tanInput': {
           'data': [52.69781494140625],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -39,7 +39,7 @@ const tanTests = [
       'expectedOutputs': {
         'tanOutput': {
           'data': [-0.8582430481910706],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -59,7 +59,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -80,7 +80,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -100,7 +100,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -120,7 +120,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -140,7 +140,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -160,7 +160,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -180,7 +180,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -200,7 +200,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -220,7 +220,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -240,7 +240,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -260,7 +260,7 @@ const tanTests = [
             84.79766845703125,  -95.58502960205078,  15.552484512329102,
             -55.25654220581055, -26.884889602661133, 0.159261092543602
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -280,7 +280,7 @@ const tanTests = [
             -0.025338610634207726, -4.203672409057617,   -0.1567438244819641,
             3.495089292526245,     5.453553199768066,    0.16062140464782715
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js b/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
index 8fc7317a2cf..211ae972ebb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
@@ -14,7 +14,6 @@
 //
 // MLOperand tanh(MLOperand input);
 
-
 const getTanhPrecisionTolerance = (graphResources) => {
   const toleranceValueDict = {float32: 1 / 1024, float16: 1 / 512};
   const expectedDataType =
@@ -38,7 +37,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -59,7 +58,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -79,7 +78,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -99,7 +98,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -119,7 +118,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -139,7 +138,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -159,7 +158,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -179,7 +178,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -199,7 +198,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -219,7 +218,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -239,7 +238,7 @@ const tanhTests = [
             -1.443918228149414,  -1.9129083156585693,  2.7495968341827393,
             -0.7420240044593811, 4.856568336486816,    -0.7563357949256897
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -259,7 +258,7 @@ const tanhTests = [
             -0.894483745098114,  -0.9573289752006531, 0.9918531775474548,
             -0.6303664445877075, 0.9998790621757507,  -0.6389135718345642
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/tensor.https.any.js b/tests/wpt/tests/webnn/conformance_tests/tensor.https.any.js
index 68153b8afd4..51905bbaf3c 100644
--- a/tests/wpt/tests/webnn/conformance_tests/tensor.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/tensor.https.any.js
@@ -27,17 +27,13 @@ const bytesPerDataType = (dataType) => {
 };
 
 const sizeOfDescriptor = (descriptor) => {
-  return descriptor.dimensions.reduce(
+  return descriptor.shape.reduce(
       (accumulator, currentValue) => accumulator * currentValue,
       bytesPerDataType(descriptor.dataType));
 };
 
 const getDescriptorFromTensor = (tensor) => {
-  return {
-    dataType: tensor.dataType,
-    dimensions: tensor.shape,
-    usage: tensor.usage
-  };
+  return {dataType: tensor.dataType, shape: tensor.shape, usage: tensor.usage};
 };
 
 
@@ -57,7 +53,7 @@ const testDestroyTensor = (testName) => {
 
     try {
       const mlTensor =
-          await mlContext.createTensor({dataType: 'int32', dimensions: [2, 3]});
+          await mlContext.createTensor({dataType: 'int32', shape: [2, 3]});
     } catch (e) {
       throw new AssertionError(
           `Unable to create tensor for ${variant} variant. ${e}`);
@@ -65,7 +61,7 @@ const testDestroyTensor = (testName) => {
   });
   promise_test(async () => {
     let mlTensor =
-        await mlContext.createTensor({dataType: 'int32', dimensions: [2, 3]});
+        await mlContext.createTensor({dataType: 'int32', shape: [2, 3]});
     mlTensor.destroy();
     mlTensor.destroy();
   }, `${testName}`);
@@ -100,8 +96,7 @@ const testCreateTensor = (testName, tensorDescriptor) => {
         mlTensor.dataType, tensorDescriptor.dataType,
         'tensor data types do not match');
     assert_array_equals(
-        mlTensor.shape, tensorDescriptor.dimensions,
-        'tensor shapes do not match');
+        mlTensor.shape, tensorDescriptor.shape, 'tensor shapes do not match');
   }, `${testName} / ${tensorDescriptor.dataType}`);
 };
 
@@ -156,7 +151,7 @@ const testWriteTensor = (testName) => {
 
     try {
       const mlTensor =
-          await mlContext.createTensor({dataType: 'int32', dimensions: [2, 3]});
+          await mlContext.createTensor({dataType: 'int32', shape: [2, 3]});
     } catch (e) {
       throw new AssertionError(
           `Unable to create tensor for ${variant} variant. ${e}`);
@@ -166,7 +161,7 @@ const testWriteTensor = (testName) => {
   promise_test(async () => {
     const tensorDescriptor = {
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE,
     };
     let mlTensor = await mlContext.createTensor(tensorDescriptor);
@@ -215,7 +210,7 @@ const testWriteTensor = (testName) => {
   promise_test(async () => {
     const tensorDescriptor = {
       dataType: 'int32',
-      dimensions: [2, 2],
+      shape: [2, 2],
       usage: MLTensorUsage.WRITE,
     };
     let mlTensor = await mlContext.createTensor(tensorDescriptor);
@@ -232,7 +227,7 @@ const testWriteTensor = (testName) => {
   promise_test(async () => {
     const tensorDescriptor = {
       dataType: 'int32',
-      dimensions: [2, 3],
+      shape: [2, 3],
       usage: MLTensorUsage.WRITE,
     };
     let mlTensor = await mlContext.createTensor(tensorDescriptor);
@@ -251,7 +246,7 @@ const testWriteTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
 
@@ -274,7 +269,7 @@ const testWriteTensor = (testName) => {
   promise_test(async () => {
     const tensorDescriptor = {
       dataType: 'int32',
-      dimensions: [2, 2],
+      shape: [2, 2],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     };
     let mlTensor = await mlContext.createTensor(tensorDescriptor);
@@ -315,7 +310,7 @@ const testReadTensor = (testName) => {
 
     try {
       const mlTensor =
-          await mlContext.createTensor({dataType: 'int32', dimensions: [2, 3]});
+          await mlContext.createTensor({dataType: 'int32', shape: [2, 3]});
     } catch (e) {
       throw new AssertionError(
           `Unable to create tensor for ${variant} variant. ${e}`);
@@ -325,7 +320,7 @@ const testReadTensor = (testName) => {
   promise_test(async t => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [2, 2],
+      shape: [2, 2],
       usage: MLTensorUsage.READ,
     });
 
@@ -339,7 +334,7 @@ const testReadTensor = (testName) => {
   promise_test(async t => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [2, 3],
+      shape: [2, 3],
       usage: MLTensorUsage.READ,
     });
 
@@ -355,7 +350,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1024],
+      shape: [1024],
       usage: MLTensorUsage.READ,
     });
 
@@ -365,7 +360,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.READ | MLTensorUsage.WRITE,
     });
 
@@ -381,7 +376,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
 
@@ -399,7 +394,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
 
@@ -417,7 +412,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
 
@@ -435,7 +430,7 @@ const testReadTensor = (testName) => {
   promise_test(async () => {
     let mlTensor = await mlContext.createTensor({
       dataType: 'int32',
-      dimensions: [1],
+      shape: [1],
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     });
 
@@ -452,7 +447,7 @@ const testReadTensor = (testName) => {
   promise_test(async t => {
     const tensorDescriptor = {
       dataType: 'int32',
-      dimensions: [2, 3],
+      shape: [2, 3],
       usage: MLTensorUsage.READ,
     };
     let mlTensor = await mlContext.createTensor(tensorDescriptor);
@@ -488,7 +483,7 @@ const testDispatchTensor = (testName) => {
     const builder = new MLGraphBuilder(mlContext);
     const tensorDescriptor = {
       dataType: 'float32',
-      dimensions: shape,
+      shape: shape,
       usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
     };
     const lhsOperand = builder.input('lhs', tensorDescriptor);
@@ -500,7 +495,7 @@ const testDispatchTensor = (testName) => {
 
     try {
       const mlTensor =
-          await mlContext.createTensor({dataType: 'int32', dimensions: [2, 3]});
+          await mlContext.createTensor({dataType: 'int32', shape: [2, 3]});
     } catch (e) {
       throw new AssertionError(
           `Unable to create tensor for ${variant} variant. ${e}`);
@@ -551,7 +546,7 @@ const testDispatchTensor = (testName) => {
     const lhsTensor = await mlContext.createTensor({
       dataType: inputs['lhs'].dataType,
       // Input rank is too high.
-      dimensions: inputs['lhs'].shape.concat([2])
+      shape: inputs['lhs'].shape.concat([2])
     });
 
     assert_throws_js(
@@ -566,7 +561,7 @@ const testDispatchTensor = (testName) => {
     const rhsTensor = await mlContext.createTensor({
       dataType: inputs['rhs'].dataType,
       // Input rank is too low.
-      dimensions: inputs['rhs'].shape.slice(1)
+      shape: inputs['rhs'].shape.slice(1)
     });
 
     assert_throws_js(
@@ -582,7 +577,7 @@ const testDispatchTensor = (testName) => {
     let output1WrongShape = [...outputs['output1'].shape];
     output1WrongShape[0] += 2;
     const outputTensor1 = await mlContext.createTensor(
-        {dataType: outputs['output1'].dataType, dimensions: output1WrongShape});
+        {dataType: outputs['output1'].dataType, shape: output1WrongShape});
 
     assert_throws_js(TypeError, () => mlContext.dispatch(mlGraph, inputs, {
       'output1': outputTensor1,
@@ -593,7 +588,7 @@ const testDispatchTensor = (testName) => {
     let output2WrongShape = [...outputs['output2'].shape];
     output2WrongShape[1] -= 1;
     const outputTensor2 = await mlContext.createTensor(
-        {dataType: outputs['output2'].dataType, dimensions: output2WrongShape});
+        {dataType: outputs['output2'].dataType, shape: output2WrongShape});
 
     assert_throws_js(TypeError, () => mlContext.dispatch(mlGraph, inputs, {
       'output1': outputs['output1'],
@@ -613,10 +608,8 @@ const testDispatchTensor = (testName) => {
         TypeError,
         () => mlContext.dispatch(
             mlGraph, {
-              'lhs': mlContext.createTensor({
-                dataType: inputWrongDataType,
-                dimensions: inputs['lhs'].shape
-              }),
+              'lhs': mlContext.createTensor(
+                  {dataType: inputWrongDataType, shape: inputs['lhs'].shape}),
               'rhs': inputs['rhs'],
             },
             outputs));
@@ -626,10 +619,8 @@ const testDispatchTensor = (testName) => {
         () => mlContext.dispatch(
             mlGraph, {
               'lhs': inputs['lhs'],
-              'rhs': mlContext.createTensor({
-                dataType: inputWrongDataType,
-                dimensions: inputs['rhs'].shape
-              }),
+              'rhs': mlContext.createTensor(
+                  {dataType: inputWrongDataType, shape: inputs['rhs'].shape}),
             },
             outputs));
 
@@ -638,7 +629,7 @@ const testDispatchTensor = (testName) => {
     assert_not_equals(outputs['output1'].dataType, outputWrongDataType);
     assert_not_equals(outputs['output2'].dataType, outputWrongDataType);
     const outputTensor1 = await mlContext.createTensor(
-        {dataType: outputWrongDataType, dimensions: outputs['output1'].shape});
+        {dataType: outputWrongDataType, shape: outputs['output1'].shape});
 
     assert_throws_js(TypeError, () => mlContext.dispatch(mlGraph, inputs, {
       'output1': outputTensor1,
@@ -646,7 +637,7 @@ const testDispatchTensor = (testName) => {
     }));
 
     const outputTensor2 = await mlContext.createTensor(
-        {dataType: outputWrongDataType, dimensions: outputs['output2'].shape});
+        {dataType: outputWrongDataType, shape: outputs['output2'].shape});
 
     assert_throws_js(TypeError, () => mlContext.dispatch(mlGraph, inputs, {
       'output1': outputs['output1'],
@@ -961,7 +952,7 @@ const testDispatchTensor = (testName) => {
   promise_test(async () => {
     // Construct a simple graph: OUTPUT = LHS - RHS.
     const builder = new MLGraphBuilder(mlContext);
-    const operandType = {dataType: 'float32', dimensions: shape};
+    const operandType = {dataType: 'float32', shape};
     const lhsOperand = builder.input('lhs', operandType);
     const rhsOperand = builder.input('rhs', operandType);
     const graph =
@@ -1148,16 +1139,16 @@ const testDispatchTensor = (testName) => {
 };
 
 if (navigator.ml) {
-  testCreateTensor('create', {dataType: 'float16', dimensions: [2, 3]});
-  testCreateTensor('create', {dataType: 'float32', dimensions: [1, 5]});
-  testCreateTensor('create', {dataType: 'int32', dimensions: [4]});
-  testCreateTensor('create', {dataType: 'uint8', dimensions: [3, 2, 4]});
+  testCreateTensor('create', {dataType: 'float16', shape: [2, 3]});
+  testCreateTensor('create', {dataType: 'float32', shape: [1, 5]});
+  testCreateTensor('create', {dataType: 'int32', shape: [4]});
+  testCreateTensor('create', {dataType: 'uint8', shape: [3, 2, 4]});
 
   testCreateTensorFails(
-      'createFailsEmptyDimension', {dataType: 'int32', dimensions: [2, 0, 3]});
+      'createFailsEmptyDimension', {dataType: 'int32', shape: [2, 0, 3]});
   testCreateTensorFails('createFailsTooLarge', {
     dataType: 'int32',
-    dimensions: [kMaxUnsignedLong, kMaxUnsignedLong, kMaxUnsignedLong]
+    shape: [kMaxUnsignedLong, kMaxUnsignedLong, kMaxUnsignedLong]
   });
 
   testDestroyTensor('destroyTwice');
diff --git a/tests/wpt/tests/webnn/conformance_tests/tile.https.any.js b/tests/wpt/tests/webnn/conformance_tests/tile.https.any.js
index 427fd216015..f85518e5248 100644
--- a/tests/wpt/tests/webnn/conformance_tests/tile.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/tile.https.any.js
@@ -28,7 +28,7 @@ const tileTests = [
       'inputs': {
         'tileInput': {
           'data': [1, 2, 3, 4],
-          'descriptor': {'dimensions': [4], 'dataType': 'float32'},
+          'descriptor': {shape: [4], dataType: 'float32'},
           'constant': true
         }
       },
@@ -40,7 +40,7 @@ const tileTests = [
       'expectedOutputs': {
         'tileOutput': {
           'data': [1, 2, 3, 4, 1, 2, 3, 4],
-          'descriptor': {'dimensions': [8], 'dataType': 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'}
         }
       }
     }
@@ -51,7 +51,7 @@ const tileTests = [
       'inputs': {
         'tileInput': {
           'data': [1, 2, 3, 4],
-          'descriptor': {'dimensions': [2, 2], 'dataType': 'uint32'},
+          'descriptor': {shape: [2, 2], dataType: 'uint32'},
           'constant': true
         }
       },
@@ -66,7 +66,7 @@ const tileTests = [
             1, 2, 1, 2, 1, 2, 3, 4, 3, 4, 3, 4,
             1, 2, 1, 2, 1, 2, 3, 4, 3, 4, 3, 4
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint32'}
+          'descriptor': {shape: [4, 6], dataType: 'uint32'}
         }
       }
     }
@@ -77,7 +77,7 @@ const tileTests = [
       'inputs': {
         'tileInput': {
           'data': [1, 2, 3, 4],
-          'descriptor': {'dimensions': [1, 1, 2, 2], 'dataType': 'int32'},
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'int32'},
           'constant': true
         }
       },
@@ -89,7 +89,7 @@ const tileTests = [
       'expectedOutputs': {
         'tileOutput': {
           'data': [1, 2, 1, 2, 3, 4, 3, 4, 1, 2, 1, 2, 3, 4, 3, 4],
-          'descriptor': {'dimensions': [1, 1, 4, 4], 'dataType': 'int32'}
+          'descriptor': {shape: [1, 1, 4, 4], dataType: 'int32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/transpose.https.any.js b/tests/wpt/tests/webnn/conformance_tests/transpose.https.any.js
index 61f043a9b0f..4370c63de4a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/transpose.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/transpose.https.any.js
@@ -43,7 +43,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -64,7 +64,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -84,7 +84,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -104,7 +104,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -124,7 +124,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -144,7 +144,7 @@ const transposeTests = [
             5.62217378616333,   38.466827392578125, -69.25324249267578,
             -84.74308776855469, -25.66281509399414, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [6, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4], dataType: 'float32'}
         }
       }
     }
@@ -164,7 +164,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -184,7 +184,7 @@ const transposeTests = [
             38.081748962402344,  -25.695144653320312, 92.8102798461914,
             -87.58920288085938,  -84.74308776855469,  2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 3, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 2], dataType: 'float32'}
         }
       }
     }
@@ -204,7 +204,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -224,7 +224,7 @@ const transposeTests = [
             38.081748962402344,  -25.695144653320312, 92.8102798461914,
             -87.58920288085938,  -84.74308776855469,  2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 3, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 2, 1], dataType: 'float32'}
         }
       }
     }
@@ -244,7 +244,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -264,7 +264,7 @@ const transposeTests = [
             38.081748962402344,  -25.695144653320312, 92.8102798461914,
             -87.58920288085938,  -84.74308776855469,  2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 3, 1, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 3, 1, 2, 1], dataType: 'float32'}
         }
       }
     }
@@ -284,7 +284,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -305,7 +305,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -325,7 +325,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -346,7 +346,7 @@ const transposeTests = [
             5.62217378616333,   38.466827392578125, -69.25324249267578,
             -84.74308776855469, -25.66281509399414, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [6, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [6, 4], dataType: 'float32'}
         }
       }
     }
@@ -366,7 +366,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -388,7 +388,7 @@ const transposeTests = [
             38.081748962402344,  92.8102798461914,   -84.74308776855469,
             -25.695144653320312, -87.58920288085938, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [4, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -408,7 +408,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [1, 2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -431,7 +431,7 @@ const transposeTests = [
             77.05838012695312,  -66.00990295410156,  57.46807861328125,
             38.466827392578125, -84.74308776855469,  2.1999382972717285
           ],
-          'descriptor': {'dimensions': [3, 4, 1, 2], 'dataType': 'float32'}
+          'descriptor': {shape: [3, 4, 1, 2], dataType: 'float32'}
         }
       }
     }
@@ -451,7 +451,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -474,7 +474,7 @@ const transposeTests = [
             99.46284484863281,   -87.58920288085938, -65.3779067993164,
             -66.00990295410156,  38.466827392578125, 2.1999382972717285
           ],
-          'descriptor': {'dimensions': [2, 3, 1, 4, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 1, 4, 1], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/triangular.https.any.js b/tests/wpt/tests/webnn/conformance_tests/triangular.https.any.js
index 7c79518d43f..64a33e4a4c2 100644
--- a/tests/wpt/tests/webnn/conformance_tests/triangular.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/triangular.https.any.js
@@ -46,7 +46,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -82,7 +82,7 @@ const triangularTests = [
             77.58269500732422,
             91.03327178955078
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -102,7 +102,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -138,7 +138,7 @@ const triangularTests = [
             77.58269500732422,
             91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -158,7 +158,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -182,7 +182,7 @@ const triangularTests = [
             -84.96932220458984,  0,
             77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -202,7 +202,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -222,7 +222,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 1, 4, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float32'}
         }
       }
     }
@@ -242,7 +242,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -267,7 +267,7 @@ const triangularTests = [
             -84.96932220458984,  0,
             77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -287,7 +287,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -324,7 +324,7 @@ const triangularTests = [
             77.58269500732422,
             0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -344,7 +344,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -369,7 +369,7 @@ const triangularTests = [
             -84.96932220458984,  0,
             77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -389,7 +389,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -426,7 +426,7 @@ const triangularTests = [
             0,
             91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -446,7 +446,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -467,7 +467,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -487,7 +487,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -502,7 +502,7 @@ const triangularTests = [
             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': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -522,7 +522,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -543,7 +543,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -564,7 +564,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -603,7 +603,7 @@ const triangularTests = [
             0,
             91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -624,7 +624,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -647,7 +647,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   0,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -668,7 +668,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -687,7 +687,7 @@ const triangularTests = [
             0, 0, 0, 67.48285675048828,  0, 0,
             0, 0, 0, -88.97057342529297, 0, 0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -708,7 +708,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -731,7 +731,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -752,7 +752,7 @@ const triangularTests = [
             20.88446617126465,  71.37139892578125,   -84.96932220458984,
             -88.97057342529297, 77.58269500732422,   91.03327178955078
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -769,7 +769,7 @@ const triangularTests = [
             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': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/conformance_tests/where.https.any.js b/tests/wpt/tests/webnn/conformance_tests/where.https.any.js
index 957f8286083..1c1860fd9a1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/where.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/where.https.any.js
@@ -28,17 +28,15 @@ const whereTests = [
     'name': 'where float32 0D scalars',
     'graph': {
       'inputs': {
-        'inputCondition': {
-          'data': [247],
-          'descriptor': {'dimensions': [], 'dataType': 'uint8'}
-        },
+        'inputCondition':
+            {'data': [247], 'descriptor': {shape: [], dataType: 'uint8'}},
         'inputTrueValue': {
           'data': [-22.83924102783203],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [-50.02232360839844],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -47,12 +45,12 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
           'data': [-22.83924102783203],
-          'descriptor': {'dimensions': [], 'dataType': 'float32'}
+          'descriptor': {shape: [], dataType: 'float32'}
         }
       }
     }
@@ -66,7 +64,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'},
+          'descriptor': {shape: [24], dataType: 'uint8'},
           'constant': true
         },
         'inputTrueValue': {
@@ -80,7 +78,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         },
         'inputFalseValue': {
@@ -94,7 +92,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'},
+          'descriptor': {shape: [24], dataType: 'float32'},
           'constant': true
         }
       },
@@ -104,7 +102,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -118,7 +116,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -132,7 +130,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'uint8'}
+          'descriptor': {shape: [24], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -145,7 +143,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -158,7 +156,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -167,7 +165,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -181,7 +179,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [24], 'dataType': 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'}
         }
       }
     }
@@ -195,7 +193,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'uint8'}
+          'descriptor': {shape: [4, 6], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -208,7 +206,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -221,7 +219,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -230,7 +228,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -244,7 +242,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [4, 6], 'dataType': 'float32'}
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
       }
     }
@@ -258,7 +256,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -271,7 +269,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -284,7 +282,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -293,7 +291,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -307,7 +305,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 3, 4], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
       }
     }
@@ -321,7 +319,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -334,7 +332,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -347,7 +345,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -356,7 +354,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -370,7 +368,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -384,7 +382,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -397,7 +395,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -410,7 +408,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -419,7 +417,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -433,7 +431,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -442,10 +440,8 @@ const whereTests = [
     'name': 'where float32 4D tensors only broadcast condition 0D to 4D',
     'graph': {
       'inputs': {
-        'inputCondition': {
-          'data': [247],
-          'descriptor': {'dimensions': [], 'dataType': 'uint8'}
-        },
+        'inputCondition':
+            {'data': [247], 'descriptor': {shape: [], dataType: 'uint8'}},
         'inputTrueValue': {
           'data': [
             70.27151489257812,   89.99047088623047,  -1.5351932048797607,
@@ -457,7 +453,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -470,7 +466,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -479,7 +475,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -493,7 +489,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -504,7 +500,7 @@ const whereTests = [
       'inputs': {
         'inputCondition': {
           'data': [253, 222, 0],
-          'descriptor': {'dimensions': [3], 'dataType': 'uint8'}
+          'descriptor': {shape: [3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -517,7 +513,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -530,7 +526,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -539,7 +535,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -553,7 +549,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, 18.877336502075195,
             -23.302522659301758, 30.851404190063477, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -564,7 +560,7 @@ const whereTests = [
       'inputs': {
         'inputCondition': {
           'data': [103, 0],
-          'descriptor': {'dimensions': [2, 1], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 1], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -577,7 +573,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -590,7 +586,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -599,7 +595,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -613,7 +609,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             62.31299591064453,   48.867103576660156, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -624,7 +620,7 @@ const whereTests = [
       'inputs': {
         'inputCondition': {
           'data': [235, 0, 93, 213, 0, 117],
-          'descriptor': {'dimensions': [1, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [1, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -637,7 +633,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -650,7 +646,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -659,7 +655,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -673,7 +669,7 @@ const whereTests = [
             -29.081029891967773, 74.97810363769531,   -10.8577880859375,
             -23.302522659301758, 48.867103576660156,  -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -684,7 +680,7 @@ const whereTests = [
       'inputs': {
         'inputCondition': {
           'data': [0, 165, 0, 90],
-          'descriptor': {'dimensions': [1, 2, 2, 1], 'dataType': 'uint8'}
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -697,7 +693,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -710,7 +706,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -719,7 +715,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -733,7 +729,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             -23.302522659301758, 30.851404190063477,  -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -747,14 +743,14 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
             38.77214050292969, 18.20477294921875, -11.542049407958984,
             -82.74693298339844, -18.61202621459961, -75.77534484863281
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -767,7 +763,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -776,7 +772,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -790,7 +786,7 @@ const whereTests = [
             38.77214050292969,   18.20477294921875,  18.877336502075195,
             -82.74693298339844,  -18.61202621459961, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -804,14 +800,14 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
             -29.164173126220703, 32.200286865234375, -6.146966457366943,
             -24.822790145874023
           ],
-          'descriptor': {'dimensions': [2, 2, 1, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1, 1], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
@@ -824,7 +820,7 @@ const whereTests = [
             22.937334060668945,  74.97810363769531,   18.877336502075195,
             62.31299591064453,   48.867103576660156,  -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -833,7 +829,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -847,7 +843,7 @@ const whereTests = [
             -24.822790145874023, -24.822790145874023, 18.877336502075195,
             -24.822790145874023, -24.822790145874023, -75.41789245605469
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -861,7 +857,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -874,14 +870,14 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
             -86.59848022460938, -67.72773742675781, -30.731334686279297,
             -93.49223327636719
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -890,7 +886,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -904,7 +900,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336,  -30.731334686279297,
             -23.302522659301758, 30.851404190063477,  -93.49223327636719
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -918,7 +914,7 @@ const whereTests = [
             241, 0,   85,  0,   227, 51, 202, 0,  104, 227, 129, 129,
             175, 134, 130, 140, 103, 46, 158, 17, 0,   41,  94,  0
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
@@ -931,14 +927,14 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336, -10.8577880859375,
             -23.302522659301758, 30.851404190063477, -58.82704544067383
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
             17.777414321899414, -1.9890096187591553, -57.28207015991211,
             -80.01390838623047, 66.87323760986328, -31.328258514404297
           ],
-          'descriptor': {'dimensions': [1, 2, 1, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [1, 2, 1, 3], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -947,7 +943,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -961,7 +957,7 @@ const whereTests = [
             -29.081029891967773, -12.19106674194336,  -31.328258514404297,
             -23.302522659301758, 30.851404190063477,  -31.328258514404297
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
@@ -972,21 +968,21 @@ const whereTests = [
       'inputs': {
         'inputCondition': {
           'data': [58, 217],
-          'descriptor': {'dimensions': [2, 1, 1, 1], 'dataType': 'uint8'}
+          'descriptor': {shape: [2, 1, 1, 1], dataType: 'uint8'}
         },
         'inputTrueValue': {
           'data': [
             38.77214050292969, 18.20477294921875, -11.542049407958984,
             -82.74693298339844, -18.61202621459961, -75.77534484863281
           ],
-          'descriptor': {'dimensions': [2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
         },
         'inputFalseValue': {
           'data': [
             -86.59848022460938, -67.72773742675781, -30.731334686279297,
             -93.49223327636719
           ],
-          'descriptor': {'dimensions': [2, 2, 1], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 1], dataType: 'float32'}
         }
       },
       'operators': [{
@@ -995,7 +991,7 @@ const whereTests = [
           {'condition': 'inputCondition'}, {'trueValue': 'inputTrueValue'},
           {'falseValue': 'inputFalseValue'}
         ],
-        'outputs': 'output'
+        'outputs': 'whereOutput'
       }],
       'expectedOutputs': {
         'whereOutput': {
@@ -1009,7 +1005,7 @@ const whereTests = [
             38.77214050292969,  18.20477294921875,  -11.542049407958984,
             -82.74693298339844, -18.61202621459961, -75.77534484863281
           ],
-          'descriptor': {'dimensions': [2, 2, 2, 3], 'dataType': 'float32'}
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
diff --git a/tests/wpt/tests/webnn/idlharness.https.any.js b/tests/wpt/tests/webnn/idlharness.https.any.js
index 6c95e534a4c..905744ffea6 100644
--- a/tests/wpt/tests/webnn/idlharness.https.any.js
+++ b/tests/wpt/tests/webnn/idlharness.https.any.js
@@ -28,11 +28,9 @@ idl_test(
 
     self.context = await navigator.ml.createContext();
     self.builder = new MLGraphBuilder(self.context);
-    self.input =
-        builder.input('input', {dataType: 'float32', dimensions: [2, 3]});
+    self.input = builder.input('input', {dataType: 'float32', shape: [2, 3]});
     self.constant = builder.constant(
-        {dataType: 'float32', dimensions: [2, 3]},
-        new Float32Array(2 * 3).fill(1));
+        {dataType: 'float32', shape: [2, 3]}, new Float32Array(2 * 3).fill(1));
 
     self.output = builder.add(input, constant);
 
diff --git a/tests/wpt/tests/webnn/resources/utils.js b/tests/wpt/tests/webnn/resources/utils.js
index c6b6010b3b0..460fe461154 100644
--- a/tests/wpt/tests/webnn/resources/utils.js
+++ b/tests/wpt/tests/webnn/resources/utils.js
@@ -1,5 +1,75 @@
 'use strict';
 
+const operatorToleranceDict = {
+  batchNormalization: {float32: 6, float16: 6},
+  clamp: {float32: 0, float16: 0},
+  elu: {float32: 18, float16: 18},
+  gelu: {float32: 18, float16: 18},
+  hardSigmoid: {float32: 2, float16: 2},
+  hardSwish: {float32: 4, float16: 4},
+  leakyRelu: {float32: 1, float16: 1},
+  linear: {float32: 2, float16: 2},
+  prelu: {float32: 1, float16: 1},
+  relu: {float32: 0, float16: 0},
+  reshape: {float32: 0, float16: 0},
+  sigmoid: {float32: 34, float16: 3},
+  softplus: {float32: 18, float16: 18},
+  softsign: {float32: 3, float16: 3},
+};
+
+const getSoftmaxPrecisionTolerance =
+    (op, graphResources, intermediateOperands) => {
+      const {inputs} = graphResources;
+      const args = op.arguments;
+      let inputShape;
+      const inputIndex = args[0][Object.keys(args[0])[0]];
+      if (inputs[inputIndex]) {
+        inputShape = inputs[inputIndex].descriptor.shape;
+      } else {
+        inputShape = intermediateOperands[inputIndex].shape();
+      }
+      const axis = args.length === 2 ? args[1][Object.keys(args[1])[0]] : 1;
+      const tolerance = inputShape[axis] * 3 + 3;
+      const toleranceValueDict = {float32: tolerance, float16: tolerance};
+      const expectedDataType =
+          getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
+      return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+    };
+
+const getPrecisionTolerance = (graphResources, intermediateOperands) => {
+  const expectedDataType =
+      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
+  let toleranceValue = 0;
+  graphResources.operators.forEach(op => {
+    switch (op.name) {
+      case 'conv2d':
+        toleranceValue += getConv2dPrecisionTolerance(op, graphResources,
+            intermediateOperands).value;
+        break;
+      case 'convTranspose2d':
+        toleranceValue += getConv2dPrecisionTolerance(op, graphResources,
+            intermediateOperands).value;
+        break;
+      case 'gemm':
+        toleranceValue += getGemmPrecisionTolerance(op, graphResources,
+            intermediateOperands).value;
+        break;
+      case 'softmax':
+        toleranceValue += getSoftmaxPrecisionTolerance(
+                              op, graphResources, intermediateOperands)
+                              .value;
+        break;
+      default:
+        const operatorTolerance =
+            operatorToleranceDict[op.name]?.[expectedDataType];
+        if (operatorTolerance !== undefined) {
+          toleranceValue += operatorTolerance;
+        }
+    }
+  });
+  return {metricType: 'ULP', value: toleranceValue};
+};
+
 // https://www.w3.org/TR/webnn/#enumdef-mloperanddatatype
 const TypedArrayDict = {
   float32: Float32Array,
@@ -62,8 +132,8 @@ const assertDescriptorsEquals = (outputOperand, expected) => {
       outputOperand.dataType() === dataType,
       'actual output dataType should be equal to expected output dataType');
   assert_array_equals(
-      outputOperand.shape(), expected.dimensions,
-      'actual output dimesnisons should be equal to expected output dimensions');
+      outputOperand.shape(), expected.shape,
+      'actual output shape should be equal to expected output shape');
 };
 
 // ref:
@@ -271,36 +341,36 @@ const doAssert =
  *     Array[Object.<MLNamedArrayBufferViews>]} actual
  * @param {Object} graphResources - Resources used for building a graph
  */
-const assertResultsEquals = (toleranceFunc, actual, graphResources) => {
-  const operatorName =
-      graphResources.operators.map(operator => operator.name).join(' ');
-  const expectedOutputs = graphResources.expectedOutputs;
-  const toleranceInfo = toleranceFunc(graphResources);
-  const metricType = toleranceInfo.metricType;
-  const toleranceValue = toleranceInfo.value;
-  let outputData;
+const assertResultsEquals =
+    (toleranceFunc, actual, graphResources, intermediateOperands) => {
+      const operatorName =
+          graphResources.operators.map(operator => operator.name).join(' ');
+      const expectedOutputs = graphResources.expectedOutputs;
+      const toleranceInfo = toleranceFunc(graphResources, intermediateOperands);
+      const metricType = toleranceInfo.metricType;
+      const toleranceValue = toleranceInfo.value;
+      let outputData;
 
-  for (let operandName in actual) {
-    const expectedSuboutput = expectedOutputs[operandName];
-    const expectedDescriptor = expectedSuboutput.descriptor;
-    let expectedData = expectedSuboutput.data;
-
-    outputData = actual[operandName];
-    // If data is scalar and shape is not, it means it's expecting to be
-    // filled by the scalar value. Also limit the array size so it doesn't
-    // timeout.
-    if (typeof (expectedData) === 'number' && expectedDescriptor.dimensions &&
-        sizeOfShape(expectedDescriptor.dimensions) > 1) {
-      const size = Math.min(
-          kMaximumIndexToValidate, sizeOfShape(expectedDescriptor.dimensions));
-      expectedData = new Array(size).fill(expectedData);
-      outputData = outputData.subarray(0, kMaximumIndexToValidate);
-    }
-    doAssert(
-        operatorName, outputData, expectedData, metricType, toleranceValue,
-        expectedDescriptor.dataType);
-  }
-};
+      for (let operandName in actual) {
+        const expectedSuboutput = expectedOutputs[operandName];
+        const expectedDescriptor = expectedSuboutput.descriptor;
+        let expectedData = expectedSuboutput.data;
+        outputData = actual[operandName];
+        // If data is scalar and shape is not, it means it's expecting to be
+        // filled by the scalar value. Also limit the array size so it doesn't
+        // timeout.
+        if (typeof (expectedData) === 'number' && expectedDescriptor.shape &&
+            sizeOfShape(expectedDescriptor.shape) > 1) {
+          const size = Math.min(
+              kMaximumIndexToValidate, sizeOfShape(expectedDescriptor.shape));
+          expectedData = new Array(size).fill(expectedData);
+          outputData = outputData.subarray(0, kMaximumIndexToValidate);
+        }
+        doAssert(
+            operatorName, outputData, expectedData, metricType, toleranceValue,
+            expectedDescriptor.dataType);
+      }
+    };
 
 const createOperand = (context, builder, operandName, resources) => {
   let operand;
@@ -322,7 +392,7 @@ const createOperand = (context, builder, operandName, resources) => {
       builder.constant(
           descriptor,
           getTypedArrayData(
-              descriptor.dataType, sizeOfShape(descriptor.dimensions),
+              descriptor.dataType, sizeOfShape(descriptor.shape),
               resources.data)) :
       builder.input(operandName, descriptor);
 
@@ -341,7 +411,7 @@ const prepareInputsForGraph = (inputs, resources) => {
           inputOperandResources.descriptor.castedType ?
               inputOperandResources.descriptor.castedType :
               inputOperandResources.descriptor.dataType,
-          sizeOfShape(inputOperandResources.descriptor.dimensions),
+          sizeOfShape(inputOperandResources.descriptor.shape),
           inputOperandResources.data);
     }
   }
@@ -353,7 +423,7 @@ const prepareOutputsForGraph = (outputs, resources) => {
     const dataType =
         descriptor.castedType ? descriptor.castedType : descriptor.dataType;
     outputs[operandName] =
-        new TypedArrayDict[dataType](sizeOfShape(descriptor.dimensions));
+        new TypedArrayDict[dataType](sizeOfShape(descriptor.shape));
   }
 };
 
@@ -380,15 +450,13 @@ const prepareOutputsForGraph = (outputs, resources) => {
  * @returns A Promise of MLComputeResult.
  */
 const buildGraphAndCompute = async (context, builder, graphResources) => {
-  let outputOperands;
+  const outputOperands = [];
   const graphInputs = graphResources.inputs;
   const graphOperators = graphResources.operators;
-
-  if (graphOperators.length === 1) {
-    // For a test graph with a single operator
+  const intermediateOperands = {};
+  for (const operator of graphOperators) {
     const argumentArray = [];
-
-    for (const argument of graphOperators[0].arguments) {
+    for (const argument of operator.arguments) {
       for (const argumentName in argument) {
         if (argumentName !== 'options') {
           if (graphInputs.hasOwnProperty(argument[argumentName])) {
@@ -396,6 +464,9 @@ const buildGraphAndCompute = async (context, builder, graphResources) => {
             const operand = createOperand(
                 context, builder, operandName, graphInputs[operandName]);
             argumentArray.push(operand);
+          } else if (intermediateOperands.hasOwnProperty(
+                         argument[argumentName])) {
+            argumentArray.push(intermediateOperands[argument[argumentName]]);
           } else {
             argumentArray.push(argument[argumentName]);
           }
@@ -408,20 +479,37 @@ const buildGraphAndCompute = async (context, builder, graphResources) => {
               const operand = createOperand(
                   context, builder, operandName, graphInputs[operandName]);
               argument['options'][optionalArgumentName] = operand;
+            } else if (
+                typeof value === 'string' &&
+                intermediateOperands.hasOwnProperty(value)) {
+              argument['options'][optionalArgumentName] =
+                  intermediateOperands[value];
             }
           }
           argumentArray.push(argument['options']);
         }
       }
     }
-    outputOperands = builder[graphOperators[0].name](...argumentArray);
-  } else {
-    // For a test graph with multiple operators
-    // TODO: https://issues.chromium.org/issues/333756077
+
+    const currentOutput = builder[operator.name](...argumentArray);
+    if (Array.isArray(operator.outputs)) {
+      operator.outputs.forEach((outputName, index) => {
+        intermediateOperands[outputName] = currentOutput[index];
+      });
+    } else {
+      intermediateOperands[operator.outputs] = currentOutput;
+    }
   }
 
-  if (!Array.isArray(outputOperands)) {
-    outputOperands = [outputOperands];
+  const outputNames = Object.keys(graphResources.expectedOutputs);
+  outputNames.forEach(outputName => {
+    if (intermediateOperands.hasOwnProperty(outputName)) {
+      outputOperands.push(intermediateOperands[outputName]);
+    }
+  });
+
+  if (outputOperands.length !== outputNames.length) {
+    throw new Error('Graph outputs are not properly defined');
   }
 
   for (let i = 0; i < outputOperands.length; ++i) {
@@ -461,19 +549,68 @@ const buildGraphAndCompute = async (context, builder, graphResources) => {
 
   // Execute the compiled graph.
   const result = await context.compute(graph, inputs, outputs);
-  return result;
+  return {result, intermediateOperands};
 };
 
-const getConv2dPrecisionTolerance = (graphResources) => {
+const getGemmPrecisionTolerance =
+    (op, graphResources, intermediateOperands) => {
+  // GEMM : alpha * (A x B) + beta * C
+  // An upper bound for the worst serial ordering is bounded by
+  // the number of lossy operations, where matrix multiplication
+  // is a dot product (mul and add times the number of elements)
+  // plus bias operations.
+  const {inputs} = graphResources;
+  const args = op.arguments;
+  let ShapeA;
+  const indexA = args[0][Object.keys(args[0])[0]];
+  if (inputs[indexA]) {
+    ShapeA = inputs[indexA].descriptor.shape;
+  } else {
+    ShapeA = intermediateOperands[indexA].shape();
+  }
+  const options =
+      args.length === 3 ? {...args[2][Object.keys(args[2])[0]]} : {};
+  const width = options.aTranspose ? ShapeA[0] : ShapeA[1];
+  let tolerance = width * 2;
+  // default options.alpha is 1.0
+  if (options.alpha !== undefined && options.alpha !== 1.0) {
+    tolerance++;
+  }
+  if (options.c && options.beta !== 0.0) {
+    // default options.beta is 1.0
+    if (options.beta !== undefined && options.beta !== 1.0) {
+      tolerance++;
+    }
+    tolerance++;
+  }
+
+  const toleranceValueDict = {float32: tolerance, float16: tolerance};
+  const expectedDataType =
+      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
+  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+};
+
+const getConv2dPrecisionTolerance =
+    (op, graphResources, intermediateOperands) => {
   // number of reduced input elements multiplied by filter and summed (a sliding
   // dot product like pooling)
-  const operatorResources = graphResources.operators[0];
-  const operatorName = operatorResources.name;
-  const args = operatorResources.arguments;
-  const inputShape = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                         .descriptor.dimensions;
-  const filterShape = graphResources.inputs[args[1][Object.keys(args[1])[0]]]
-                          .descriptor.dimensions;
+  const {inputs} = graphResources;
+  const operatorName = op.name;
+  const args = op.arguments;
+  let inputShape;
+  const inputIndex = args[0][Object.keys(args[0])[0]];
+  const filterIndex = args[1][Object.keys(args[1])[0]];
+  if (inputs[inputIndex]) {
+    inputShape = inputs[inputIndex].descriptor.shape;
+  } else {
+    inputShape = intermediateOperands[inputIndex].shape();
+  }
+  let filterShape;
+  if (inputs[filterIndex]) {
+    filterShape = inputs[filterIndex].descriptor.shape;
+  } else {
+    filterShape = intermediateOperands[filterIndex].shape();
+  }
   const options =
       args.length === 3 ? {...args[2][Object.keys(args[2])[0]]} : {};
   let inputChannels = inputShape[1];  // default nchw inputLayout
@@ -538,7 +675,7 @@ const getReducedElementCount =
     (graphResources) => {
       const args = graphResources.operators[0].arguments;
       const inputShape = graphResources.inputs[args[0][Object.keys(args[0])[0]]]
-                             .descriptor.dimensions;
+                             .descriptor.shape;
       const rank = inputShape.length;
       const options =
           args.length === 2 ? {...args[1][Object.keys(args[1])[0]]} : {};
@@ -568,8 +705,10 @@ const webnn_conformance_test =
               `Unable to create context for ${variant} variant. ${e}`);
         }
         const builder = new MLGraphBuilder(context);
-        const result = await buildGraphAndComputeFunc(
+        const {result, intermediateOperands} = await buildGraphAndComputeFunc(
             context, builder, testResources.graph);
-        assertResultsEquals(toleranceFunc, result.outputs, testResources.graph);
+        assertResultsEquals(
+            toleranceFunc, result.outputs, testResources.graph,
+            intermediateOperands);
       }, testResources.name);
     };
diff --git a/tests/wpt/tests/webnn/resources/utils_validation.js b/tests/wpt/tests/webnn/resources/utils_validation.js
index 856eea6cb3f..f491801bf3a 100644
--- a/tests/wpt/tests/webnn/resources/utils_validation.js
+++ b/tests/wpt/tests/webnn/resources/utils_validation.js
@@ -24,12 +24,12 @@ const signedIntegerTypes = ['int32', 'int64', 'int8'];
 
 const unsignedLongType = 'unsigned long';
 
-const dimensions0D = [];
-const dimensions1D = [2];
-const dimensions2D = [2, 3];
-const dimensions3D = [2, 3, 4];
-const dimensions4D = [2, 3, 4, 5];
-const dimensions5D = [2, 3, 4, 5, 6];
+const shape0D = [];
+const shape1D = [2];
+const shape2D = [2, 3];
+const shape3D = [2, 3, 4];
+const shape4D = [2, 3, 4, 5];
+const shape5D = [2, 3, 4, 5, 6];
 
 const adjustOffsetsArray = [
   // Decrease 1
@@ -40,14 +40,8 @@ const adjustOffsetsArray = [
 
 // TODO
 // Add more 5+ dimensions
-const allWebNNDimensionsArray = [
-  dimensions0D,
-  dimensions1D,
-  dimensions2D,
-  dimensions3D,
-  dimensions4D,
-  dimensions5D
-];
+const allWebNNShapesArray =
+    [shape0D, shape1D, shape2D, shape3D, shape4D, shape5D];
 
 const notUnsignedLongAxisArray = [
   // String
@@ -64,15 +58,15 @@ const notUnsignedLongAxisArray = [
   new Date("2024-01-01"),
 ];
 
-function getRank(inputDimensions) {
-  return inputDimensions.length;
+function getRank(inputShape) {
+  return inputShape.length;
 }
 
-function getAxisArray(inputDimensions) {
-  return Array.from({length: inputDimensions.length}, (_, i) => i);
+function getAxisArray(inputShape) {
+  return Array.from({length: inputShape.length}, (_, i) => i);
 }
 
-function getAxesArrayContainSameValues(inputDimensions) {
+function getAxesArrayContainSameValues(inputShape) {
   // TODO
   // Currently this function returns an array containing each element which all have the same value.
   // For example axes: [0, 1, 2] for 3D input tensor
@@ -117,9 +111,9 @@ function getAxesArrayContainSameValues(inputDimensions) {
   //   [2, 2, 2]
   // ]
   const axesArrayContainSameValues = [];
-  const length = inputDimensions.length;
+  const length = inputShape.length;
   if (length >= 2) {
-    const validAxesArrayFull = getAxisArray(inputDimensions);
+    const validAxesArrayFull = getAxisArray(inputShape);
     for (let index = 0; index < length; index++) {
       axesArrayContainSameValues.push(new Array(2).fill(validAxesArrayFull[index]));
       if (length > 2) {
@@ -130,9 +124,9 @@ function getAxesArrayContainSameValues(inputDimensions) {
   return axesArrayContainSameValues;
 }
 
-function generateUnbroadcastableDimensionsArray(dimensions) {
-  // Currently this function returns an array of some unbroadcastable dimensions.
-  // for example given dimensions [2, 3, 4]
+function generateUnbroadcastableShapes(shape) {
+  // Currently this function returns an array of some unbroadcastable shapes.
+  // for example given the input shape [2, 3, 4]
   // this function returns
   // [
   //   [3, 3, 4],
@@ -149,34 +143,34 @@ function generateUnbroadcastableDimensionsArray(dimensions) {
   //   [1, 1, 1, 3],
   //   [1, 1, 1, 5],
   // ]
-  if (dimensions.every(v => v === 1)) {
-    throw new Error(`[${dimensions}] always can be broadcasted`);
+  if (shape.every(dimension => dimension === 1)) {
+    throw new Error(`[${shape}] always can be broadcasted`);
   }
-  const resultDimensions = [];
-  const length = dimensions.length;
-  if (!dimensions.slice(0, length - 1).every(v => v === 1)) {
+  const resultShapes = [];
+  const length = shape.length;
+  if (!shape.slice(0, length - 1).every(dimension => dimension === 1)) {
     for (let i = 0; i < length; i++) {
-      if (dimensions[i] !== 1) {
+      if (shape[i] !== 1) {
         for (let offset of [-1, 1]) {
-          const dimensionsB = dimensions.slice();
-          dimensionsB[i] += offset;
-          if (dimensionsB[i] !== 1) {
-            resultDimensions.push(dimensionsB);
+          const shapeB = shape.slice();
+          shapeB[i] += offset;
+          if (shapeB[i] !== 1) {
+            resultShapes.push(shapeB);
           }
         }
       }
     }
   }
-  const lastDimensionSize = dimensions[length - 1];
+  const lastDimensionSize = shape[length - 1];
   if (lastDimensionSize !== 1) {
     for (let j = 0; j <= length; j++) {
       if (lastDimensionSize > 2) {
-        resultDimensions.push(Array(j).fill(1).concat([lastDimensionSize - 1]));
+        resultShapes.push(Array(j).fill(1).concat([lastDimensionSize - 1]));
       }
-      resultDimensions.push(Array(j).fill(1).concat([lastDimensionSize + 1]));
+      resultShapes.push(Array(j).fill(1).concat([lastDimensionSize + 1]));
     }
   }
-  return resultDimensions;
+  return resultShapes;
 }
 
 function generateOutOfRangeValuesArray(type) {
@@ -229,15 +223,17 @@ function validateTwoInputsBroadcastable(operationName, label) {
         assert_throws_js(
             TypeError,
             () => builder.input(
-                `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
         continue;
       }
-      for (let dimensions of allWebNNDimensionsArray) {
-        if (dimensions.length > 0) {
-          const inputA = builder.input(`inputA${++inputAIndex}`, {dataType, dimensions});
-          const unbroadcastableDimensionsArray = generateUnbroadcastableDimensionsArray(dimensions);
-          for (let unbroadcastableDimensions of unbroadcastableDimensionsArray) {
-            const inputB = builder.input(`inputB${++inputBIndex}`, {dataType, dimensions: unbroadcastableDimensions});
+      for (let shape of allWebNNShapesArray) {
+        if (shape.length > 0) {
+          const inputA =
+              builder.input(`inputA${++inputAIndex}`, {dataType, shape});
+          const unbroadcastableShapes = generateUnbroadcastableShapes(shape);
+          for (let shape of unbroadcastableShapes) {
+            const inputB =
+                builder.input(`inputB${++inputBIndex}`, {dataType, shape});
             assert_equals(typeof builder[operationName], 'function');
             const options = {label};
             const regrexp = new RegExp('\\[' + label + '\\]');
@@ -272,22 +268,24 @@ function validateTwoInputsOfSameDataType(operationName, label) {
           assert_throws_js(
               TypeError,
               () => builder.input(
-                  `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                  `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
           continue;
         }
-        for (let dimensions of allWebNNDimensionsArray) {
-          const inputA = builder.input(`inputA${++inputAIndex}`, {dataType, dimensions});
+        for (let shape of allWebNNShapesArray) {
+          const inputA =
+              builder.input(`inputA${++inputAIndex}`, {dataType, shape});
           for (let dataTypeB of allWebNNOperandDataTypes) {
             if (!context.opSupportLimits().input.dataTypes.includes(
                     dataTypeB)) {
               assert_throws_js(
                   TypeError,
                   () => builder.input(
-                      `inputB${++inputBIndex}`, {dataTypeB, dimensions1D}));
+                      `inputB${++inputBIndex}`, {dataTypeB, shape1D}));
               continue;
             }
             if (dataType !== dataTypeB) {
-              const inputB = builder.input(`inputB${++inputBIndex}`, {dataType: dataTypeB, dimensions});
+              const inputB = builder.input(
+                  `inputB${++inputBIndex}`, {dataType: dataTypeB, shape});
               const options = {label};
               const regrexp = new RegExp('\\[' + label + '\\]');
               assert_equals(typeof builder[subOperationName], 'function');
@@ -330,14 +328,14 @@ function validateOptionsAxes(operationName) {
           assert_throws_js(
               TypeError,
               () => builder.input(
-                  `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                  `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
           continue;
         }
-        for (let dimensions of allWebNNDimensionsArray) {
-          const rank = getRank(dimensions);
+        for (let shape of allWebNNShapesArray) {
+          const rank = getRank(shape);
           if (rank >= 1) {
             const input =
-                builder.input(`input${++inputIndex}`, {dataType, dimensions});
+                builder.input(`input${++inputIndex}`, {dataType, shape});
             for (let invalidAxis of invalidAxisArray) {
               assert_equals(typeof builder[subOperationName], 'function');
               assert_throws_js(
@@ -367,14 +365,14 @@ function validateOptionsAxes(operationName) {
           assert_throws_js(
               TypeError,
               () => builder.input(
-                  `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                  `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
           continue;
         }
-        for (let dimensions of allWebNNDimensionsArray) {
-          const rank = getRank(dimensions);
+        for (let shape of allWebNNShapesArray) {
+          const rank = getRank(shape);
           if (rank >= 1) {
             const input =
-                builder.input(`input${++inputIndex}`, {dataType, dimensions});
+                builder.input(`input${++inputIndex}`, {dataType, shape});
             assert_equals(typeof builder[subOperationName], 'function');
             assert_throws_js(
                 TypeError,
@@ -395,16 +393,16 @@ function validateOptionsAxes(operationName) {
           assert_throws_js(
               TypeError,
               () => builder.input(
-                  `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                  `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
           continue;
         }
-        for (let dimensions of allWebNNDimensionsArray) {
-          const rank = getRank(dimensions);
+        for (let shape of allWebNNShapesArray) {
+          const rank = getRank(shape);
           if (rank >= 2) {
             const input =
-                builder.input(`input${++inputIndex}`, {dataType, dimensions});
+                builder.input(`input${++inputIndex}`, {dataType, shape});
             const axesArrayContainSameValues =
-                getAxesArrayContainSameValues(dimensions);
+                getAxesArrayContainSameValues(shape);
             for (let axes of axesArrayContainSameValues) {
               assert_equals(typeof builder[subOperationName], 'function');
               assert_throws_js(
@@ -433,15 +431,15 @@ function validateUnaryOperation(operationName, supportedDataTypes, label) {
         assert_throws_js(
             TypeError,
             () => builder.input(
-                `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
         continue;
       }
-      for (let dimensions of allWebNNDimensionsArray) {
-        const input = builder.input(`input`, {dataType, dimensions});
+      for (let shape of allWebNNShapesArray) {
+        const input = builder.input(`input`, {dataType, shape});
         assert_equals(typeof builder[operationName], 'function');
         const output = builder[operationName](input);
         assert_equals(output.dataType(), dataType);
-        assert_array_equals(output.shape(), dimensions);
+        assert_array_equals(output.shape(), shape);
       }
     }
   }, `[${operationName}] Test building an unary operator with supported type.`);
@@ -455,11 +453,11 @@ function validateUnaryOperation(operationName, supportedDataTypes, label) {
         assert_throws_js(
             TypeError,
             () => builder.input(
-                `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
         continue;
       }
-      for (let dimensions of allWebNNDimensionsArray) {
-        const input = builder.input(`input`, {dataType, dimensions});
+      for (let shape of allWebNNShapesArray) {
+        const input = builder.input(`input`, {dataType, shape});
         assert_equals(typeof builder[operationName], 'function');
         const options = {label};
         const regrexp = new RegExp('\\[' + label + '\\]');
@@ -483,11 +481,11 @@ function validateSingleInputOperation(operationName, label) {
       if (!context.opSupportLimits().input.dataTypes.includes(dataType)) {
         continue;
       }
-      for (let dimensions of allWebNNDimensionsArray) {
-        const input = builder.input(`input`, {dataType, dimensions});
+      for (let shape of allWebNNShapesArray) {
+        const input = builder.input(`input`, {dataType, shape});
         const output = builder[operationName](input);
         assert_equals(output.dataType(), dataType);
-        assert_array_equals(output.shape(), dimensions);
+        assert_array_equals(output.shape(), shape);
       }
     }
   }, `[${operationName}] Test building the operator with supported data type.`);
@@ -503,11 +501,11 @@ function validateSingleInputOperation(operationName, label) {
         assert_throws_js(
             TypeError,
             () => builder.input(
-                `inputA${++inputAIndex}`, {dataType, dimensions1D}));
+                `inputA${++inputAIndex}`, {dataType, shape: shape1D}));
         continue;
       }
-      for (let dimensions of allWebNNDimensionsArray) {
-        const input = builder.input(`input`, {dataType, dimensions});
+      for (let shape of allWebNNShapesArray) {
+        const input = builder.input(`input`, {dataType, shape});
         assert_equals(typeof builder[operationName], 'function');
         const options = {label};
         const regrexp = new RegExp('\\[' + label + '\\]');
@@ -527,7 +525,7 @@ function validateSingleInputOperation(operationName, label) {
  */
 function validateInputFromAnotherBuilder(operatorName, operatorDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 2]
+  shape: [2, 2]
 }) {
   multi_builder_test(async (t, builder, otherBuilder) => {
     const inputFromOtherBuilder =
@@ -545,7 +543,7 @@ function validateInputFromAnotherBuilder(operatorName, operatorDescriptor = {
  * @param {String} operationName
  */
 function validateTwoInputsFromMultipleBuilders(operatorName) {
-  const opDescriptor = {dataType: 'float32', dimensions: [2, 2]};
+  const opDescriptor = {dataType: 'float32', shape: [2, 2]};
 
   multi_builder_test(async (t, builder, otherBuilder) => {
     const inputFromOtherBuilder = otherBuilder.input('other', opDescriptor);
diff --git a/tests/wpt/tests/webnn/validation_tests/argMinMax.https.any.js b/tests/wpt/tests/webnn/validation_tests/argMinMax.https.any.js
index 3d3f7148715..abd4e878a2a 100644
--- a/tests/wpt/tests/webnn/validation_tests/argMinMax.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/argMinMax.https.any.js
@@ -17,38 +17,38 @@ const label = 'arg_min_max_1_!';
 const tests = [
   {
     name: '[argMin/Max] Test with default options.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     axis: 0,
-    output: {dimensions: [2, 3, 4]}
+    output: {shape: [2, 3, 4]}
   },
   {
     name: '[argMin/Max] Test with axes=1.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     axis: 1,
-    output: {dimensions: [1, 3, 4]}
+    output: {shape: [1, 3, 4]}
   },
   {
     name: '[argMin/Max] Test with outputDataType=int32',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     axis: 1,
     options: {
       outputDataType: 'int32',
     },
-    output: {dimensions: [1, 3, 4]}
+    output: {shape: [1, 3, 4]}
   },
   {
     name: '[argMin/Max] Test with outputDataType=int64',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     axis: 1,
     options: {
       outputDataType: 'int64',
     },
-    output: {dimensions: [1, 3, 4]}
+    output: {shape: [1, 3, 4]}
   },
   {
     name:
         '[argMin/Max] Throw if the value in axis is greater than or equal to input rank.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     axis: 4,
     options: {
       label: label,
@@ -56,7 +56,7 @@ const tests = [
   },
   {
     name: '[argMin/Max] Throw if input is a scalar and axis=0.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     axis: 0,
     options: {
       label: label,
@@ -68,16 +68,14 @@ function runTests(operatorName, tests) {
   tests.forEach(test => {
     promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-        'input',
-        { dataType: test.input.dataType, dimensions: test.input.dimensions });
+      const input = builder.input('input', test.input);
       const axis = test.axis;
       if (test.options && test.options.outputDataType !== undefined) {
         if (context.opSupportLimits()[operatorName].output.dataTypes.includes(
           test.options.outputDataType)) {
           const output = builder[operatorName](input, axis, test.options);
           assert_equals(output.dataType(), test.options.outputDataType);
-          assert_array_equals(output.shape(), test.output.dimensions);
+          assert_array_equals(output.shape(), test.output.shape);
         } else {
           assert_throws_js(
             TypeError, () => builder[operatorName](input, axis, test.options));
@@ -87,7 +85,7 @@ function runTests(operatorName, tests) {
       if (test.output) {
         const output = builder[operatorName](input, axis, test.options);
         assert_equals(output.dataType(), 'int32');
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = /\[arg_min_max_1_\!\]/;
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/batchNormalization.https.any.js b/tests/wpt/tests/webnn/validation_tests/batchNormalization.https.any.js
index 6a884de3ee3..636f803ecb7 100644
--- a/tests/wpt/tests/webnn/validation_tests/batchNormalization.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/batchNormalization.https.any.js
@@ -12,13 +12,13 @@ let varianceIndex = 0;
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 2]
+  shape: [2, 2]
 };
 // 1D tensor descriptor which may be used for `mean`, `variance`, `scale`, or
 // `bias` inputs.
 const kExample1DTensorDescriptor = {
   dataType: 'float32',
-  dimensions: [kExampleInputDescriptor.dimensions[/* axis */ 1]]
+  shape: [kExampleInputDescriptor.shape[/* axis */ 1]]
 };
 
 multi_builder_test(async (t, builder, otherBuilder) => {
@@ -83,28 +83,28 @@ const label = `batchNormalization_?_123`;
 const tests = [
   {
     name: '[batchNormalization] Test with default options.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [2]},
-    variance: {dataType: 'float32', dimensions: [2]},
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [2]},
+    variance: {dataType: 'float32', shape: [2]},
+    output: {dataType: 'float32', shape: [1, 2, 5, 5]},
   },
   {
     name: '[batchNormalization] Test with axis = 2 and epsilon = 0.0001.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [5]},
-    variance: {dataType: 'float32', dimensions: [5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [5]},
+    variance: {dataType: 'float32', shape: [5]},
     options: {
       axis: 2,
       epsilon: 1e-4,  // 1e-5 is the default value of epsilon.
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    output: {dataType: 'float32', shape: [1, 2, 5, 5]},
   },
   {
     name:
         '[batchNormalization] Throw if the input data type is not one of floating point types.',
-    input: {dataType: 'int32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'int32', dimensions: [2]},
-    variance: {dataType: 'int32', dimensions: [2]},
+    input: {dataType: 'int32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'int32', shape: [2]},
+    variance: {dataType: 'int32', shape: [2]},
     options: {
       label: label,
     },
@@ -112,18 +112,18 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the mean data type is not the same as the input data type.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float16', dimensions: [2]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float16', shape: [2]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
       label: label,
     },
   },
   {
     name: '[batchNormalization] Throw if the mean operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [1, 2]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [1, 2]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
       label: label,
     },
@@ -131,9 +131,9 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the size of mean operand is not equal to the size of the input dimension denoted by axis.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [3]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [3]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
       axis: 1,
       label: label,
@@ -142,9 +142,9 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the variance data type is not the same as the input data type.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [2]},
-    variance: {dataType: 'float16', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [2]},
+    variance: {dataType: 'float16', shape: [2]},
     options: {
       label: label,
     },
@@ -152,9 +152,9 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the variance operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [2]},
-    variance: {dataType: 'float32', dimensions: [2, 2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [2]},
+    variance: {dataType: 'float32', shape: [2, 2]},
     options: {
       label: label,
     },
@@ -162,9 +162,9 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the size of variance operand is not equal to the size of the input dimension denoted by axis.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [5]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [5]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
       axis: 2,
       label: label,
@@ -173,76 +173,76 @@ const tests = [
   {
     name:
         '[batchNormalization] Throw if the scale data type is not the same as the input data type.',
-    input: {dataType: 'float16', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float16', dimensions: [2]},
-    variance: {dataType: 'float16', dimensions: [2]},
+    input: {dataType: 'float16', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float16', shape: [2]},
+    variance: {dataType: 'float16', shape: [2]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[batchNormalization] Throw if the scale operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [2]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [2]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2, 1]},
+      scale: {dataType: 'float32', shape: [2, 1]},
       label: label,
     },
   },
   {
     name:
         '[batchNormalization] Throw if the size of scale operand is not equal to the size of the input dimension denoted by axis.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [5]},
-    variance: {dataType: 'float32', dimensions: [5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [5]},
+    variance: {dataType: 'float32', shape: [5]},
     options: {
       axis: 2,
-      scale: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[batchNormalization] Throw if the bias data type is not the same as the input data type.',
-    input: {dataType: 'float16', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float16', dimensions: [2]},
-    variance: {dataType: 'float16', dimensions: [2]},
+    input: {dataType: 'float16', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float16', shape: [2]},
+    variance: {dataType: 'float16', shape: [2]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name: '[batchNormalization] Throw if the bias operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [2]},
-    variance: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [2]},
+    variance: {dataType: 'float32', shape: [2]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2, 1]},
+      bias: {dataType: 'float32', shape: [2, 1]},
       label: label,
     },
   },
   {
     name:
         '[batchNormalization] Throw if the size of bias operand is not equal to the size of the input dimension denoted by axis.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [5]},
-    variance: {dataType: 'float32', dimensions: [5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [5]},
+    variance: {dataType: 'float32', shape: [5]},
     options: {
       axis: 2,
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[batchNormalization] Throw if the value of axis is not in the range of [0,N-1].',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    mean: {dataType: 'float32', dimensions: [5]},
-    variance: {dataType: 'float32', dimensions: [5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    mean: {dataType: 'float32', shape: [5]},
+    variance: {dataType: 'float32', shape: [5]},
     options: {
       axis: 4,
       label: label,
@@ -253,35 +253,22 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const mean = builder.input(
-          'mean',
-          {dataType: test.mean.dataType, dimensions: test.mean.dimensions});
-      const variance = builder.input('variance', {
-        dataType: test.variance.dataType,
-        dimensions: test.variance.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const mean = builder.input('mean', test.mean);
+      const variance = builder.input('variance', test.variance);
 
       if (test.options && test.options.bias) {
-        test.options.bias = builder.input('bias', {
-          dataType: test.options.bias.dataType,
-          dimensions: test.options.bias.dimensions
-        });
+        test.options.bias = builder.input('bias', test.options.bias);
       }
       if (test.options && test.options.scale) {
-        test.options.scale = builder.input('scale', {
-          dataType: test.options.scale.dataType,
-          dimensions: test.options.scale.dimensions
-        });
+        test.options.scale = builder.input('scale', test.options.scale);
       }
 
       if (test.output) {
         const output =
             builder.batchNormalization(input, mean, variance, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = /\[batchNormalization_\?_123\]/;
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/build-more-than-once.https.any.js b/tests/wpt/tests/webnn/validation_tests/build-more-than-once.https.any.js
index c4cbcae8f32..3d648c9b019 100644
--- a/tests/wpt/tests/webnn/validation_tests/build-more-than-once.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/build-more-than-once.https.any.js
@@ -7,7 +7,7 @@
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2]
+  shape: [2]
 };
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/webnn/validation_tests/cast.https.any.js b/tests/wpt/tests/webnn/validation_tests/cast.https.any.js
index b20d8186900..0dee2f0f071 100644
--- a/tests/wpt/tests/webnn/validation_tests/cast.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/cast.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'int32', dimensions: [2, 2]});
+      otherBuilder.input('input', {dataType: 'int32', shape: [2, 2]});
 
   assert_throws_js(
       TypeError, () => builder.cast(inputFromOtherBuilder, 'int64'));
diff --git a/tests/wpt/tests/webnn/validation_tests/clamp.https.any.js b/tests/wpt/tests/webnn/validation_tests/clamp.https.any.js
index 10cf0028e52..e76092daf43 100644
--- a/tests/wpt/tests/webnn/validation_tests/clamp.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/clamp.https.any.js
@@ -16,8 +16,7 @@ validateSingleInputOperation('clamp', label);
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {minValue: 1.0, maxValue: 3.0};
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   const output = builder.clamp(input, options);
   assert_equals(output.dataType(), 'float32');
   assert_array_equals(output.shape(), [1, 2, 3]);
@@ -27,7 +26,7 @@ promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {minValue: 0, maxValue: 0};
   const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3, 4]});
+      builder.input('input', {dataType: 'float32', shape: [1, 2, 3, 4]});
   const output = builder.clamp(input, options);
   assert_equals(output.dataType(), 'float32');
   assert_array_equals(output.shape(), [1, 2, 3, 4]);
@@ -40,8 +39,7 @@ promise_test(async t => {
     maxValue: 1.0,
     label: label,
   };
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   const regrexp = new RegExp('\\[' + label + '\\]');
   assert_throws_with_label(() => builder.clamp(input, options), regrexp);
 }, '[clamp] Throw if options.minValue > options.maxValue');
@@ -54,6 +52,6 @@ promise_test(async t => {
     minValue: -Infinity,
     label: label,
   };
-  const input = builder.input('input', {dataType: 'float32', dimensions: []});
+  const input = builder.input('input', {dataType: 'float32', shape: []});
   assert_throws_js(TypeError, () => builder.clamp(input, options));
 }, '[clamp] Throw if options.minValue is -Infinity');
diff --git a/tests/wpt/tests/webnn/validation_tests/compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.js b/tests/wpt/tests/webnn/validation_tests/compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.js
index 65bd805c31f..097a8f84d8b 100644
--- a/tests/wpt/tests/webnn/validation_tests/compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/compute-multiple-arraybufferviews-sharing-same-arraybuffer.https.any.js
@@ -9,8 +9,8 @@
 // https://issues.chromium.org/issues/332002364
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
-  const b = builder.input('b', {dataType: 'float32', dimensions: [2]});
+  const a = builder.input('a', {dataType: 'float32', shape: [2]});
+  const b = builder.input('b', {dataType: 'float32', shape: [2]});
   const c = builder.add(a, b);
   const graph = await builder.build({c});
   const arraybuffer = new ArrayBuffer(100);
@@ -24,7 +24,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
+  const a = builder.input('a', {dataType: 'float32', shape: [2]});
   const [b, c] = builder.split(a, 2);
   const graph = await builder.build({b, c});
   const aBuffer = new Float32Array(2);
@@ -38,7 +38,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
+  const a = builder.input('a', {dataType: 'float32', shape: [2]});
   const b = builder.relu(a);
   const graph = await builder.build({b});
   const arraybuffer = new ArrayBuffer(100);
@@ -50,7 +50,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const a = builder.input('a', {dataType: 'float32', dimensions: [2]});
+  const a = builder.input('a', {dataType: 'float32', shape: [2]});
   const b = builder.relu(a);
   const graph = await builder.build({b});
   const buffer = new Float32Array(2);
diff --git a/tests/wpt/tests/webnn/validation_tests/concat.https.any.js b/tests/wpt/tests/webnn/validation_tests/concat.https.any.js
index 4902caf6619..65c56a84246 100644
--- a/tests/wpt/tests/webnn/validation_tests/concat.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/concat.https.any.js
@@ -11,37 +11,35 @@ const label = `concate_123`;
 const tests = [
   {
     name: '[concat] Test building Concat with one input.',
-    inputs: [{dataType: 'float32', dimensions: [4, 4, 3]}],
+    inputs: [{dataType: 'float32', shape: [4, 4, 3]}],
     axis: 2,
-    output: {dataType: 'float32', dimensions: [4, 4, 3]}
+    output: {dataType: 'float32', shape: [4, 4, 3]}
   },
   {
     name: '[concat] Test building Concat with two inputs',
     inputs: [
-      {dataType: 'float32', dimensions: [3, 1, 5]},
-      {dataType: 'float32', dimensions: [3, 2, 5]}
+      {dataType: 'float32', shape: [3, 1, 5]},
+      {dataType: 'float32', shape: [3, 2, 5]}
     ],
     axis: 1,
-    output: {dataType: 'float32', dimensions: [3, 3, 5]}
+    output: {dataType: 'float32', shape: [3, 3, 5]}
   },
   {
     name: '[concat] Test building Concat with three inputs',
     inputs: [
-      {dataType: 'float32', dimensions: [3, 5, 1]},
-      {dataType: 'float32', dimensions: [3, 5, 2]},
-      {dataType: 'float32', dimensions: [3, 5, 3]}
+      {dataType: 'float32', shape: [3, 5, 1]},
+      {dataType: 'float32', shape: [3, 5, 2]},
+      {dataType: 'float32', shape: [3, 5, 3]}
     ],
     axis: 2,
-    output: {dataType: 'float32', dimensions: [3, 5, 6]}
+    output: {dataType: 'float32', shape: [3, 5, 6]}
   },
   {
     name: '[concat] Test building Concat with two 1D inputs.',
-    inputs: [
-      {dataType: 'float32', dimensions: [1]},
-      {dataType: 'float32', dimensions: [1]}
-    ],
+    inputs:
+        [{dataType: 'float32', shape: [1]}, {dataType: 'float32', shape: [1]}],
     axis: 0,
-    output: {dataType: 'float32', dimensions: [2]}
+    output: {dataType: 'float32', shape: [2]}
   },
   {
     name: '[concat] Throw if the inputs are empty.',
@@ -50,16 +48,15 @@ const tests = [
   {
     name: '[concat] Throw if the argument types are inconsistent.',
     inputs: [
-      {dataType: 'float32', dimensions: [1, 1]},
-      {dataType: 'int32', dimensions: [1, 1]}
+      {dataType: 'float32', shape: [1, 1]}, {dataType: 'int32', shape: [1, 1]}
     ],
     axis: 0,
   },
   {
     name: '[concat] Throw if the inputs have different ranks.',
     inputs: [
-      {dataType: 'float32', dimensions: [1, 1]},
-      {dataType: 'float32', dimensions: [1, 1, 1]}
+      {dataType: 'float32', shape: [1, 1]},
+      {dataType: 'float32', shape: [1, 1, 1]}
     ],
     axis: 0,
   },
@@ -67,25 +64,22 @@ const tests = [
     name:
         '[concat] Throw if the axis is equal to or greater than the size of ranks',
     inputs: [
-      {dataType: 'float32', dimensions: [1, 1]},
-      {dataType: 'float32', dimensions: [1, 1]}
+      {dataType: 'float32', shape: [1, 1]}, {dataType: 'float32', shape: [1, 1]}
     ],
     axis: 2,
   },
   {
     name: '[concat] Throw if concat with two 0-D scalars.',
-    inputs: [
-      {dataType: 'float32', dimensions: []},
-      {dataType: 'float32', dimensions: []}
-    ],
+    inputs:
+        [{dataType: 'float32', shape: []}, {dataType: 'float32', shape: []}],
     axis: 0,
   },
   {
     name:
         '[concat] Throw if the inputs have other axes with different sizes except on the axis.',
     inputs: [
-      {dataType: 'float32', dimensions: [1, 1, 1]},
-      {dataType: 'float32', dimensions: [1, 2, 3]}
+      {dataType: 'float32', shape: [1, 1, 1]},
+      {dataType: 'float32', shape: [1, 2, 3]}
     ],
     axis: 1,
   },
@@ -98,16 +92,13 @@ tests.forEach(
       let inputs = [];
       if (test.inputs) {
         for (let i = 0; i < test.inputs.length; ++i) {
-          inputs[i] = builder.input(
-            `inputs[${i}]`,
-            { dataType: test.inputs[i].dataType, dimensions: test.inputs[i].dimensions }
-          );
+          inputs[i] = builder.input(`inputs[${i}]`, test.inputs[i]);
         }
       }
       if (test.output) {
         const output = builder.concat(inputs, test.axis);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {label};
         const regrexp = new RegExp('\\[' + label + '\\]');
@@ -117,7 +108,7 @@ tests.forEach(
     }, test.name));
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const operandDescriptor = {dataType: 'float32', dimensions: [2, 2]};
+  const operandDescriptor = {dataType: 'float32', shape: [2, 2]};
 
   const inputFromOtherBuilder = otherBuilder.input('input', operandDescriptor);
 
diff --git a/tests/wpt/tests/webnn/validation_tests/constant-changed-buffer.https.any.js b/tests/wpt/tests/webnn/validation_tests/constant-changed-buffer.https.any.js
index 1a516c0b1d4..40f3a0ccaef 100644
--- a/tests/wpt/tests/webnn/validation_tests/constant-changed-buffer.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/constant-changed-buffer.https.any.js
@@ -11,13 +11,13 @@ promise_test(async t => {
   let aBuffer = new Float32Array(backingBuffer, 0, 2);
   aBuffer[0] = 2;
   aBuffer[1] = 3;
-  const a = builder.constant({dataType: 'float32', dimensions: [2]}, aBuffer);
+  const a = builder.constant({dataType: 'float32', shape: [2]}, aBuffer);
 
   // Detach `aBuffer`. Constant data should already be copied, so changes to
   // the buffer afterwards should not be reflected in the graph.
   const unusedBuffer = backingBuffer.transfer();
 
-  const b = builder.input('b', {dataType: 'float32', dimensions: [2]});
+  const b = builder.input('b', {dataType: 'float32', shape: [2]});
   const c = builder.add(a, b);
   const graph = await builder.build({c});
 
@@ -32,14 +32,14 @@ promise_test(async t => {
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   let aBuffer = new Float32Array([2, 3]);
-  const a = builder.constant({dataType: 'float32', dimensions: [2]}, aBuffer);
+  const a = builder.constant({dataType: 'float32', shape: [2]}, aBuffer);
 
   // Rewrite `aBuffer` contents. Constant data should already be copied, so
   // changes to the buffer afterwards should not be reflected in the graph.
   aBuffer[0] = 10;
   aBuffer[1] = 20;
 
-  const b = builder.input('b', {dataType: 'float32', dimensions: [2]});
+  const b = builder.input('b', {dataType: 'float32', shape: [2]});
   const c = builder.add(a, b);
   const graph = await builder.build({c});
 
@@ -63,5 +63,5 @@ promise_test(async t => {
 
   assert_throws_js(
       TypeError,
-      () => builder.constant({dataType: 'float32', dimensions: [2]}, aBuffer));
+      () => builder.constant({dataType: 'float32', shape: [2]}, aBuffer));
 }, 'Constant data cannot use a detached buffer, which is empty');
diff --git a/tests/wpt/tests/webnn/validation_tests/constant.https.any.js b/tests/wpt/tests/webnn/validation_tests/constant.https.any.js
index d101d92fb80..b9b75e372b0 100644
--- a/tests/wpt/tests/webnn/validation_tests/constant.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/constant.https.any.js
@@ -14,25 +14,25 @@ const tests = [
         '[constant] Test building a 0-D scalar constant without presenting dimensions',
     descriptor: {dataType: 'float32'},
     bufferView: {type: Float32Array, byteLength: 1 * 4},
-    output: {dataType: 'float32', dimensions: []}
+    output: {dataType: 'float32', shape: []}
   },
   {
     name:
         '[constant] Test building a 0-D scalar constant with empty dimensions',
-    descriptor: {dataType: 'float32', dimensions: []},
+    descriptor: {dataType: 'float32', shape: []},
     bufferView: {type: Float32Array, byteLength: 1 * 4},
-    output: {dataType: 'float32', dimensions: []}
+    output: {dataType: 'float32', shape: []}
   },
   {
     name: '[constant] Test building a constant with float32 data type',
-    descriptor: {dataType: 'float32', dimensions: [2, 3]},
+    descriptor: {dataType: 'float32', shape: [2, 3]},
     bufferView: {type: Float32Array, byteLength: 6 * 4},
-    output: {dataType: 'float32', dimensions: [2, 3]}
+    output: {dataType: 'float32', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for float32 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'float32', dimensions: [2, 3]},
+    descriptor: {dataType: 'float32', shape: [2, 3]},
     bufferView: {
       type: Float32Array,
       byteLength: 6 * 4 - 4  // The bufferView's byte length is less than the
@@ -42,14 +42,14 @@ const tests = [
   // TODO (crbug.com/329702838): Test building a constant with float16 data type
   {
     name: '[constant] Test building a constant with int32 data type',
-    descriptor: {dataType: 'int32', dimensions: [2, 3]},
+    descriptor: {dataType: 'int32', shape: [2, 3]},
     bufferView: {type: Int32Array, byteLength: 6 * 4},
-    output: {dataType: 'int32', dimensions: [2, 3]}
+    output: {dataType: 'int32', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for int32 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'int32', dimensions: [2, 3]},
+    descriptor: {dataType: 'int32', shape: [2, 3]},
     bufferView: {
       type: Int32Array,
       byteLength: 6 * 4 + 4  // The bufferView's byte length is greater than the
@@ -58,73 +58,73 @@ const tests = [
   },
   {
     name: '[constant] Test building a constant with uint32 data type',
-    descriptor: {dataType: 'uint32', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint32', shape: [2, 3]},
     bufferView: {type: Uint32Array, byteLength: 6 * 4},
-    output: {dataType: 'uint32', dimensions: [2, 3]}
+    output: {dataType: 'uint32', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for uint32 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'uint32', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint32', shape: [2, 3]},
     bufferView: {type: Uint32Array, byteLength: 6 * 4 + 4}
   },
   {
     name: '[constant] Test building a constant with int64 data type',
-    descriptor: {dataType: 'int64', dimensions: [2, 3]},
+    descriptor: {dataType: 'int64', shape: [2, 3]},
     bufferView: {type: BigInt64Array, byteLength: 6 * 8},
-    output: {dataType: 'int64', dimensions: [2, 3]}
+    output: {dataType: 'int64', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for int64 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'int64', dimensions: [2, 3]},
+    descriptor: {dataType: 'int64', shape: [2, 3]},
     bufferView: {type: BigInt64Array, byteLength: 6 * 8 + 8}
   },
   {
     name: '[constant] Test building a constant with uint64 data type',
-    descriptor: {dataType: 'uint64', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint64', shape: [2, 3]},
     bufferView: {type: BigUint64Array, byteLength: 6 * 8},
-    output: {dataType: 'uint64', dimensions: [2, 3]}
+    output: {dataType: 'uint64', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for uint64 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'uint64', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint64', shape: [2, 3]},
     bufferView: {type: BigUint64Array, byteLength: 6 * 8 + 8}
   },
   {
     name: '[constant] Test building a constant with int8 data type',
-    descriptor: {dataType: 'int8', dimensions: [2, 3]},
+    descriptor: {dataType: 'int8', shape: [2, 3]},
     bufferView: {type: Int8Array, byteLength: 6 * 1},
-    output: {dataType: 'int8', dimensions: [2, 3]}
+    output: {dataType: 'int8', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for int8 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'int8', dimensions: [2, 3]},
+    descriptor: {dataType: 'int8', shape: [2, 3]},
     bufferView: {type: Int8Array, byteLength: 6 * 4 - 4}
   },
   {
     name: '[constant] Test building a constant with uint8 data type',
-    descriptor: {dataType: 'uint8', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint8', shape: [2, 3]},
     bufferView: {type: Uint8Array, byteLength: 6 * 1},
-    output: {dataType: 'uint8', dimensions: [2, 3]}
+    output: {dataType: 'uint8', shape: [2, 3]}
   },
   {
     name:
         '[constant] Throw if byte length of bufferView for uint8 doesn\'t match the given dimensions',
-    descriptor: {dataType: 'uint8', dimensions: [2, 3]},
+    descriptor: {dataType: 'uint8', shape: [2, 3]},
     bufferView: {type: Uint8Array, byteLength: 6 * 4 - 4}
   },
   {
     name: '[constant] Throw if a dimension is 0',
-    descriptor: {dataType: 'float32', dimensions: [2, 0]},
+    descriptor: {dataType: 'float32', shape: [2, 0]},
     bufferView: {type: Float32Array, byteLength: 2 * 4}
   },
   {
     name:
         '[constant] Throw if bufferView type doesn\'t match the operand data type',
-    descriptor: {dataType: 'float32', dimensions: [2, 3]},
+    descriptor: {dataType: 'float32', shape: [2, 3]},
     bufferView: {type: Int32Array, byteLength: 6 * 4}
   }
 ];
@@ -137,7 +137,7 @@ tests.forEach(
       if (test.output) {
         const constantOperand = builder.constant(test.descriptor, bufferView);
         assert_equals(constantOperand.dataType(), test.output.dataType);
-        assert_array_equals(constantOperand.shape(), test.output.dimensions);
+        assert_array_equals(constantOperand.shape(), test.output.shape);
       } else {
         assert_throws_js(
             TypeError, () => builder.constant(test.descriptor, bufferView));
diff --git a/tests/wpt/tests/webnn/validation_tests/conv2d.https.any.js b/tests/wpt/tests/webnn/validation_tests/conv2d.https.any.js
index 84f6a5975c1..405538ff4d8 100644
--- a/tests/wpt/tests/webnn/validation_tests/conv2d.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/conv2d.https.any.js
@@ -10,16 +10,16 @@
 // Example input in NCHW layout.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [1, 1, 5, 5]
+  shape: [1, 1, 5, 5]
 };
 // Example filter in OIHW layout.
 const kExampleFilterDescriptor = {
   dataType: 'float32',
-  dimensions: [1, 1, 3, 3]
+  shape: [1, 1, 3, 3]
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: [/* output channels */ 1]
+  shape: [/* output channels */ 1]
 };
 const label = `conv_2d_*`;
 
@@ -54,183 +54,183 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 const tests = [
   {
     name: '[conv2d] Test with default options.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with padding.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 1, 5, 5]}
   },
   {
     name: '[conv2d] Test with strides and padding.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with strides and asymmetric padding.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 4, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 4, 2]},
     options: {
       padding: [1, 2, 0, 1],
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test depthwise conv2d by setting groups to input channels.',
-    input: {dataType: 'float32', dimensions: [1, 4, 2, 2]},
-    filter: {dataType: 'float32', dimensions: [4, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 2, 2]},
+    filter: {dataType: 'float32', shape: [4, 1, 2, 2]},
     options: {
       groups: 4,
     },
-    output: {dataType: 'float32', dimensions: [1, 4, 1, 1]}
+    output: {dataType: 'float32', shape: [1, 4, 1, 1]}
   },
   {
     name:
         '[conv2d] Test depthwise conv2d with groups, inputLayout="nhwc" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 2, 2, 4]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 2, 4]},
+    filter: {dataType: 'float32', shape: [1, 2, 2, 4]},
     options: {
       groups: 4,
       inputLayout: 'nhwc',
       filterLayout: 'ihwo',
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 1, 4]}
+    output: {dataType: 'float32', shape: [1, 1, 1, 4]}
   },
   {
     name:
         '[conv2d] Test with dilations, inputLayout="nhwc" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 65, 65, 1]},
-    filter: {dataType: 'float32', dimensions: [1, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 65, 65, 1]},
+    filter: {dataType: 'float32', shape: [1, 3, 3, 1]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'ihwo',
       dilations: [4, 4],
     },
-    output: {dataType: 'float32', dimensions: [1, 57, 57, 1]}
+    output: {dataType: 'float32', shape: [1, 57, 57, 1]}
   },
   {
     name: '[conv2d] Test with inputLayout="nchw" and filterLayout="oihw".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'oihw',
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with inputLayout="nchw" and filterLayout="hwio".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'hwio',
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with inputLayout="nchw" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 3, 3, 2]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'ohwi',
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with inputLayout="nchw" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'ihwo',
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 1, 3, 3]}
   },
   {
     name: '[conv2d] Test with inputLayout="nhwc" and filterLayout="oihw".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'oihw',
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 1]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 1]}
   },
   {
     name: '[conv2d] Test with inputLayout="nhwc" and filterLayout="hwio".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'hwio',
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 1]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 1]}
   },
   {
     name: '[conv2d] Test with inputLayout="nhwc" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [1, 3, 3, 2]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'ohwi',
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 1]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 1]}
   },
   {
     name: '[conv2d] Test with inputLayout="nhwc" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'ihwo',
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 1]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 1]}
   },
   {
     name: '[conv2d] Throw if the input is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 2, 1]},
     options: {label},
   },
   {
     name: '[conv2d] Throw if the input data type is not floating point.',
-    input: {dataType: 'int32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'int32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'int32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'int32', shape: [1, 1, 2, 2]},
     options: {label},
   },
   {
     name: '[conv2d] Throw if the filter is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 2]},
     options: {label},
   },
   {
     name:
         '[conv2d] Throw if the filter data type doesn\'t match the input data type.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'int32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'int32', shape: [1, 1, 2, 2]},
     options: {
       label: label,
     },
   },
   {
     name: '[conv2d] Throw if the length of padding is not 4.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       padding: [2, 2],
       label: label,
@@ -238,8 +238,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if the length of strides is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       strides: [2],
       label: label,
@@ -247,8 +247,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if strideHeight is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       strides: [0, 1],
       label: label,
@@ -256,8 +256,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if strideWidth is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       strides: [1, 0],
       label: label,
@@ -265,8 +265,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if the length of dilations is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       dilations: [1],
       label: label,
@@ -274,8 +274,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if dilationHeight is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       dilations: [0, 1],
       label: label,
@@ -283,8 +283,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if dilationWidth is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       dilations: [1, 0],
       label: label,
@@ -292,8 +292,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if inputChannels % groups is not 0.',
-    input: {dataType: 'float32', dimensions: [1, 4, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       groups: 3,
       label: label,
@@ -302,8 +302,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels.',
-    input: {dataType: 'float32', dimensions: [1, 4, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       groups: 2,
       label: label,
@@ -311,8 +311,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if the groups is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 4, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       groups: 0,
       label: label,
@@ -321,8 +321,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw due to overflow when calculating the effective filter height.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 434983, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 434983, 2]},
     options: {
       dilations: [328442, 1],
       label: label,
@@ -331,8 +331,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw due to overflow when calculating the effective filter width.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 234545]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 234545]},
     options: {
       dilations: [2, 843452],
       label: label,
@@ -340,8 +340,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw due to overflow when dilation height is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       dilations: [kMaxUnsignedLong, 1],
       label: label,
@@ -349,8 +349,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw due to overflow when dilation width is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       dilations: [1, kMaxUnsignedLong],
       label: label,
@@ -358,8 +358,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw due to underflow when calculating the output height.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 4, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 4, 2]},
     options: {
       dilations: [4, 1],
       padding: [1, 1, 1, 1],
@@ -369,8 +369,8 @@ const tests = [
   },
   {
     name: '[conv2d] Throw due to underflow when calculating the output width.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 8]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 8]},
     options: {
       dilations: [1, 4],
       padding: [1, 1, 1, 1],
@@ -380,68 +380,68 @@ const tests = [
   },
   {
     name: '[conv2d] Throw if the bias is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
-      bias: {dataType: 'float32', dimensions: [1, 2]},
+      bias: {dataType: 'float32', shape: [1, 2]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="oihw".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="hwio".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 2, 1, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 2, 1, 1]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 2, 1]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 2, 1]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if the bias data type doesn\'t match input data type.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
-      bias: {dataType: 'int32', dimensions: [1]},
+      bias: {dataType: 'int32', shape: [1]},
       label: label,
     },
   },
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nchw" and filterLayout="oihw".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'oihw',
@@ -452,8 +452,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nchw" and filterLayout="hwio".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'hwio',
@@ -464,8 +464,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nchw" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 3, 3, 2]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'ohwi',
@@ -476,8 +476,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nchw" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       inputLayout: 'nchw',
       filterLayout: 'ihwo',
@@ -489,8 +489,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nhwc" and filterLayout="oihw".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'oihw',
@@ -501,8 +501,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nhwc" and filterLayout="hwio".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'hwio',
@@ -513,8 +513,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nhwc" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [1, 3, 3, 2]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'ohwi',
@@ -525,8 +525,8 @@ const tests = [
   {
     name:
         '[conv2d] Throw if inputChannels / groups is not equal to filterInputChannels with inputLayout="nhwc" and filterLayout="ihwo".',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       inputLayout: 'nhwc',
       filterLayout: 'ihwo',
@@ -539,18 +539,11 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const filter = builder.input(
-          'filter',
-          {dataType: test.filter.dataType, dimensions: test.filter.dimensions});
+      const input = builder.input('input', test.input);
+      const filter = builder.input('filter', test.filter);
 
       if (test.options && test.options.bias) {
-        test.options.bias = builder.input('bias', {
-          dataType: test.options.bias.dataType,
-          dimensions: test.options.bias.dimensions
-        });
+        test.options.bias = builder.input('bias', test.options.bias);
       }
 
       if (test.output &&
@@ -558,7 +551,7 @@ tests.forEach(
               test.input.dataType)) {
         const output = builder.conv2d(input, filter, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = /\[conv_2d_\*\]/;
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/convTranspose2d.https.any.js b/tests/wpt/tests/webnn/validation_tests/convTranspose2d.https.any.js
index 2c4e9dc4428..c128903e9cc 100644
--- a/tests/wpt/tests/webnn/validation_tests/convTranspose2d.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/convTranspose2d.https.any.js
@@ -10,16 +10,16 @@
 // Example input in NCHW layout.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [1, 1, 5, 5]
+  shape: [1, 1, 5, 5]
 };
 // Example filter in OIHW layout.
 const kExampleFilterDescriptor = {
   dataType: 'float32',
-  dimensions: [1, 1, 3, 3]
+  shape: [1, 1, 3, 3]
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: [/* output channels */ 1]
+  shape: [/* output channels */ 1]
 };
 
 multi_builder_test(async (t, builder, otherBuilder) => {
@@ -55,167 +55,167 @@ const label = 'conv_transpose_2d';
 const tests = [
   {
     name: '[convTranspose2d] Test with default options.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    output: {dataType: 'float32', dimensions: [1, 1, 5, 5]}
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    output: {dataType: 'float32', shape: [1, 1, 5, 5]}
   },
   {
     name:
         '[convTranspose2d] Test with inputLayout="nchw" and filterLayout="hwoi".',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       filterLayout: 'hwoi',
       inputLayout: 'nchw',
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 2, 5, 5]}
   },
   {
     name:
         '[convTranspose2d] Test with inputLayout="nchw" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       filterLayout: 'ohwi',
       inputLayout: 'nchw',
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 2, 5, 5]}
   },
   {
     name:
         '[convTranspose2d] Test with inputLayout="nhwc" and filterLayout="iohw".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 1]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 1]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       filterLayout: 'iohw',
       inputLayout: 'nhwc',
     },
-    output: {dataType: 'float32', dimensions: [1, 5, 5, 2]}
+    output: {dataType: 'float32', shape: [1, 5, 5, 2]}
   },
   {
     name:
         '[convTranspose2d] Test with inputLayout="nhwc" and filterLayout="hwoi".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 1]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 1]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       filterLayout: 'hwoi',
       inputLayout: 'nhwc',
     },
-    output: {dataType: 'float32', dimensions: [1, 5, 5, 2]}
+    output: {dataType: 'float32', shape: [1, 5, 5, 2]}
   },
   {
     name:
         '[convTranspose2d] Test with inputLayout="nhwc" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 1]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 1]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       filterLayout: 'ohwi',
       inputLayout: 'nhwc',
     },
-    output: {dataType: 'float32', dimensions: [1, 5, 5, 2]}
+    output: {dataType: 'float32', shape: [1, 5, 5, 2]}
   },
   {
     name: '[convTranspose2d] Test with strides=[3, 2], outputSizes=[10, 8].',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputSizes: [10, 8],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 10, 8]}
+    output: {dataType: 'float32', shape: [1, 2, 10, 8]}
   },
   {
     name: '[convTranspose2d] Test with strides=[3, 2], outputPadding=[1, 1].',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputPadding: [1, 1],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 10, 8]}
+    output: {dataType: 'float32', shape: [1, 2, 10, 8]}
   },
   {
     name: '[convTranspose2d] Test with padding=1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 1, 5, 5]}
   },
   {
     name: '[convTranspose2d] Test with padding=1, groups=3.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
       groups: 3,
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 3, 5, 5]}
   },
   {
     name: '[convTranspose2d] Test with strides=2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 7, 7]}
+    output: {dataType: 'float32', shape: [1, 2, 7, 7]}
   },
   {
     name: '[convTranspose2d] Test with strides=2 and padding=1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 1, 5, 5]}
   },
   {
     name:
         '[convTranspose2d] Test when the output sizes are explicitly specified, the output padding values are ignored though padding value is not smaller than stride along the same axis.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       outputPadding: [3, 3],
       strides: [3, 2],
       outputSizes: [10, 8],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 10, 8]}
+    output: {dataType: 'float32', shape: [1, 2, 10, 8]}
   },
   {
     name: '[convTranspose2d] Throw if the input is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {label},
   },
   {
     name:
         '[convTranspose2d] Throw if the input data type is not floating point.',
-    input: {dataType: 'int32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'int32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'int32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'int32', shape: [1, 1, 2, 2]},
     options: {label},
   },
   {
     name: '[convTranspose2d] Throw if the filter is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 2]},
     options: {label},
   },
   {
     name:
         '[convTranspose2d] Throw if the filter data type doesn\'t match the input data type.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'int32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'int32', shape: [1, 1, 2, 2]},
     options: {
       label: label,
     },
   },
   {
     name: '[convTranspose2d] Throw if the length of padding is not 4.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       padding: [2, 2],
       label: label,
@@ -223,8 +223,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the length of strides is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       strides: [2],
       label: label,
@@ -232,8 +232,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if one stride value is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       strides: [1, 0],
       label: label,
@@ -241,8 +241,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the length of dilations is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       dilations: [1],
       label: label,
@@ -251,8 +251,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the one dilation value is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       dilations: [1, 0],
       label: label,
@@ -261,8 +261,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels with inputLayout="nchw" and filterLayout="iohw".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       filterLayout: 'iohw',
       inputLayout: 'nchw',
@@ -273,8 +273,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels with inputLayout="nchw" and filterLayout="hwoi".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [3, 1, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 3]},
+    filter: {dataType: 'float32', shape: [3, 1, 2, 1]},
     options: {
       filterLayout: 'hwoi',
       inputLayout: 'nchw',
@@ -284,8 +284,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels with inputLayout="nchw" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 3]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       filterLayout: 'ohwi',
       inputLayout: 'nchw',
@@ -295,8 +295,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels with inputLayout="nhwc" and filterLayout="iohw".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 2]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       filterLayout: 'iohw',
       inputLayout: 'nhwc',
@@ -306,8 +306,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels inputLayout="nhwc" and filterLayout="hwoi".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
-    filter: {dataType: 'float32', dimensions: [3, 3, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 2]},
+    filter: {dataType: 'float32', shape: [3, 3, 2, 1]},
     options: {
       filterLayout: 'hwoi',
       inputLayout: 'nhwc',
@@ -317,8 +317,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the input channels is not equal to the filter input channels with inputLayout="nhwc" and filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 3, 3, 2]},
-    filter: {dataType: 'float32', dimensions: [2, 3, 3, 1]},
+    input: {dataType: 'float32', shape: [1, 3, 3, 2]},
+    filter: {dataType: 'float32', shape: [2, 3, 3, 1]},
     options: {
       filterLayout: 'ohwi',
       inputLayout: 'nhwc',
@@ -327,8 +327,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if output channels is too large.',
-    input: {dataType: 'float32', dimensions: [1, 4, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [4, 2, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 5, 5]},
+    filter: {dataType: 'float32', shape: [4, 2, 2, 2]},
     options: {
       groups: kMaxUnsignedLong,
       label: label,
@@ -336,8 +336,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the groups is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 4, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 4, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       groups: 0,
       label: label,
@@ -346,8 +346,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to overflow when calculating the effective filter height.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 434983, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 434983, 2]},
     options: {
       dilations: [328443, 1],
       label: label,
@@ -356,8 +356,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to overflow when calculating the effective filter width.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 234545]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 234545]},
     options: {
       dilations: [2, 843452],
       label: label,
@@ -366,8 +366,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to overflow when dilation height is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 2]},
     options: {
       dilations: [kMaxUnsignedLong, 1],
       label: label,
@@ -376,8 +376,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to overflow when dilation width is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 2]},
     options: {
       dilations: [1, kMaxUnsignedLong],
       label: label,
@@ -385,61 +385,61 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the bias is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
-      bias: {dataType: 'float32', dimensions: [1, 2]},
+      bias: {dataType: 'float32', shape: [1, 2]},
       label: label,
     },
   },
   {
     name:
         '[convTranspose2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="iohw".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
       filterLayout: 'iohw',
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[convTranspose2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="hwoi".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [2, 2, 1, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [2, 2, 1, 1]},
     options: {
       filterLayout: 'hwoi',
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[convTranspose2d] Throw if the bias shape is not equal to [output_channels] with filterLayout="ohwi".',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 2, 1]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 2, 2, 1]},
     options: {
       filterLayout: 'ohwi',
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[convTranspose2d] Throw if the bias data type doesn\'t match input data type.',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
+    filter: {dataType: 'float32', shape: [1, 1, 2, 2]},
     options: {
-      bias: {dataType: 'int32', dimensions: [1]},
+      bias: {dataType: 'int32', shape: [1]},
       label: label,
     },
   },
   {
     name:
         '[convTranspose2d] Throw if the outputPadding is not a sequence of length 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputPadding: [1, 1, 1, 1],
@@ -449,8 +449,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the outputPadding is not smaller than stride along the width dimension.',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 2]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [0, 0, 3, 3],
       strides: [2, 2],
@@ -461,8 +461,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the outputPadding is not smaller than stride along the height dimension.',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 2]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [0, 0, 3, 3],
       strides: [2, 2],
@@ -473,8 +473,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw if the outputSizes is not a sequence of length 2.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputSizes: [1, 2, 10, 8],
@@ -483,8 +483,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if outputSizes[0] is not greater than 0.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputSizes: [0, 7],
@@ -493,8 +493,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if outputSizes[1] is not greater than 0.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 2, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 2, 3, 3]},
     options: {
       strides: [3, 2],
       outputSizes: [9, 0],
@@ -503,8 +503,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the padding height is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 2]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [4, 4, 0, 0],
       strides: [2, 2],
@@ -514,8 +514,8 @@ const tests = [
   },
   {
     name: '[convTranspose2d] Throw if the padding width is too large.',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 2]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [0, 0, 4, 4],
       strides: [2, 2],
@@ -526,8 +526,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to outputSizes values are smaller than the output sizes calculated by not using outputPadding.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
       strides: [2, 2],
@@ -539,8 +539,8 @@ const tests = [
   {
     name:
         '[convTranspose2d] Throw due to outputSizes values are greater than the output sizes calculated by not using outputPadding.',
-    input: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
-    filter: {dataType: 'float32', dimensions: [1, 1, 3, 3]},
+    input: {dataType: 'float32', shape: [1, 1, 3, 3]},
+    filter: {dataType: 'float32', shape: [1, 1, 3, 3]},
     options: {
       padding: [1, 1, 1, 1],
       strides: [2, 2],
@@ -554,18 +554,11 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const filter = builder.input(
-          'filter',
-          {dataType: test.filter.dataType, dimensions: test.filter.dimensions});
+      const input = builder.input('input', test.input);
+      const filter = builder.input('filter', test.filter);
 
       if (test.options && test.options.bias) {
-        test.options.bias = builder.input('bias', {
-          dataType: test.options.bias.dataType,
-          dimensions: test.options.bias.dimensions
-        });
+        test.options.bias = builder.input('bias', test.options.bias);
       }
 
       if (test.output &&
@@ -573,7 +566,7 @@ tests.forEach(
               test.input.dataType)) {
         const output = builder.convTranspose2d(input, filter, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/cumulativeSum.https.any.js b/tests/wpt/tests/webnn/validation_tests/cumulativeSum.https.any.js
index 65eef7ed89d..6381d674ab4 100644
--- a/tests/wpt/tests/webnn/validation_tests/cumulativeSum.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/cumulativeSum.https.any.js
@@ -10,38 +10,38 @@
 const tests = [
   {
     name: '[cumulativeSum] Test with default options',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
     axis: 0,
-    output: {dataType: 'float32', dimensions: [3, 2, 5]}
+    output: {dataType: 'float32', shape: [3, 2, 5]}
   },
   {
     name: '[cumulativeSum] Test with axis=1',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
     axis: 1,
-    output: {dataType: 'float32', dimensions: [3, 2, 5]}
+    output: {dataType: 'float32', shape: [3, 2, 5]}
   },
   {
     name: '[cumulativeSum] Test with exclusive=true',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
     axis: 1,
     options: {exclusive: true},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]}
+    output: {dataType: 'float32', shape: [3, 2, 5]}
   },
   {
     name: '[cumulativeSum] Test with reversed=true',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
     axis: 1,
     options: {reversed: true},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]}
+    output: {dataType: 'float32', shape: [3, 2, 5]}
   },
   {
     name: '[cumulativeSum] Throw if input is a scalar',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     axis: 0
   },
   {
     name: '[cumulativeSum] Throw if axis is invalid',
-    input: {dataType: 'float32', dimensions: [1, 2, 3]},
+    input: {dataType: 'float32', shape: [1, 2, 3]},
     axis: 3
   },
 ]
@@ -63,7 +63,7 @@ tests.forEach(
       if (test.output) {
         const output = builder.cumulativeSum(input, test.axis, options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'cumulative_sum';
         options.label = label;
@@ -75,7 +75,7 @@ tests.forEach(
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [3, 2, 5]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [3, 2, 5]});
   assert_throws_js(
       TypeError, () => builder.cumulativeSum(inputFromOtherBuilder, 0));
 }, '[cumulativeSum] throw if input is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/dequantizeLinear.https.any.js b/tests/wpt/tests/webnn/validation_tests/dequantizeLinear.https.any.js
index 45a3187f65b..a5e6c8ea50e 100644
--- a/tests/wpt/tests/webnn/validation_tests/dequantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/dequantizeLinear.https.any.js
@@ -11,87 +11,80 @@ const tests = [
   {
     name:
         '[dequantizeLinear] Test scale\'s shape = [3, 2, 5] and zeroPoint\'s shape = [3, 2, 5] which is the same as input\'s shape.',
-    input: {dataType: 'int8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [3, 2, 5]},
-    zeroPoint: {dataType: 'int8', dimensions: [3, 2, 5]},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'int8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [3, 2, 5]},
+    zeroPoint: {dataType: 'int8', shape: [3, 2, 5]},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[dequantizeLinear] Test scale\'s shape = [5] and zeroPoint\'s shape = [5] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'int8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'int8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[dequantizeLinear] Test scale\'s shape = [] and zeroPoint\'s shape = [] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'uint8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: []},
-    zeroPoint: {dataType: 'uint8', dimensions: []},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'uint8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: []},
+    zeroPoint: {dataType: 'uint8', shape: []},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the shape of scale is not broadcastable to the shape of input.',
-    input: {dataType: 'uint8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [2]},
-    zeroPoint: {dataType: 'uint8', dimensions: [5]},
+    input: {dataType: 'uint8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [2]},
+    zeroPoint: {dataType: 'uint8', shape: [5]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the shape of zero_point is not broadcastable to the shape of input.',
-    input: {dataType: 'uint8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'uint8', dimensions: [2]},
+    input: {dataType: 'uint8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'uint8', shape: [2]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the data type of zeroPoint is not the same as the data type of input.',
-    input: {dataType: 'int8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'uint8', dimensions: [5]},
+    input: {dataType: 'int8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'uint8', shape: [5]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the data type of input is not int8 or uint8.',
-    input: {dataType: 'float16', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
+    input: {dataType: 'float16', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the data type of zero_point is not int8 or uint8.',
-    input: {dataType: 'int8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int32', dimensions: [5]},
+    input: {dataType: 'int8', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int32', shape: [5]},
   },
   {
     name: '[dequantizeLinear] Throw if the data type of scale is float32.',
-    input: {dataType: 'uint8', dimensions: [3, 2, 5]},
-    scale: {dataType: 'int32', dimensions: [5]},
-    zeroPoint: {dataType: 'uint8', dimensions: [5]},
+    input: {dataType: 'uint8', shape: [3, 2, 5]},
+    scale: {dataType: 'int32', shape: [5]},
+    zeroPoint: {dataType: 'uint8', shape: [5]},
   },
 ];
 
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const scale = builder.input(
-          'scale',
-          {dataType: test.scale.dataType, dimensions: test.scale.dimensions});
-      const zeroPoint = builder.input('zeroPoint', {
-        dataType: test.zeroPoint.dataType,
-        dimensions: test.zeroPoint.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const scale = builder.input('scale', test.scale);
+      const zeroPoint = builder.input('zeroPoint', test.zeroPoint);
       if (test.output) {
         const output = builder.dequantizeLinear(input, scale, zeroPoint);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'dequantize_linear_123';
         const options = {label};
@@ -104,11 +97,11 @@ tests.forEach(
 
 const kExampleInputDescriptor = {
   dataType: 'int8',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 const kExampleScaleDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
diff --git a/tests/wpt/tests/webnn/validation_tests/destroyContext.https.any.js b/tests/wpt/tests/webnn/validation_tests/destroyContext.https.any.js
index 4ec31033a6d..b4027e23dba 100644
--- a/tests/wpt/tests/webnn/validation_tests/destroyContext.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/destroyContext.https.any.js
@@ -34,7 +34,7 @@ promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   context.destroy();
   assert_throws_dom('InvalidStateError', () => {
-    const operandType = {dataType: 'float32', dimensions: [1]};
+    const operandType = {dataType: 'float32', shape: [1]};
     builder.input('input', operandType);
   });
 }, 'Destroyed context can not build operator.');
@@ -50,7 +50,7 @@ promise_test(async t => {
 promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -63,7 +63,7 @@ promise_test(async t => {
 promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -79,7 +79,7 @@ promise_test(async t => {
 promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const lhsOperand = builder.input('lhs', operandType);
   const rhsOperand = builder.input('rhs', operandType);
   const graph =
@@ -103,7 +103,7 @@ promise_test(async t => {
 promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const lhsOperand = builder.input('lhs', operandType);
   const rhsOperand = builder.input('rhs', operandType);
   const graph =
@@ -127,14 +127,14 @@ promise_test(async t => {
   context.destroy();
   promise_rejects_dom(
       t, 'InvalidStateError',
-      context.createTensor({dataType: 'float32', dimensions: [1]}));
+      context.createTensor({dataType: 'float32', shape: [1]}));
 }, 'Destroyed context can not create tensor.');
 
 promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const tensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.READ,
   });
   context.destroy();
@@ -145,7 +145,7 @@ promise_test(async t => {
   const context = await navigator.ml.createContext(contextOptions);
   const tensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.READ,
   });
   let promise = context.readTensor(tensor);
@@ -160,7 +160,7 @@ promise_test(async t => {
   another_context.destroy();
   const tensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE,
   });
   let arrayBuffer = new ArrayBuffer(4);
diff --git a/tests/wpt/tests/webnn/validation_tests/destroyGraph.https.any.js b/tests/wpt/tests/webnn/validation_tests/destroyGraph.https.any.js
index 9fd3a9e1ff7..f7eb01eafef 100644
--- a/tests/wpt/tests/webnn/validation_tests/destroyGraph.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/destroyGraph.https.any.js
@@ -22,7 +22,7 @@ promise_setup(async () => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -34,7 +34,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -49,7 +49,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -63,7 +63,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const input_operand = builder.input('input', operandType);
   const const_operand = builder.constant(operandType, Float32Array.from([2]));
   const output_operand = builder.mul(input_operand, const_operand);
@@ -78,7 +78,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const lhsOperand = builder.input('lhs', operandType);
   const rhsOperand = builder.input('rhs', operandType);
   const graph =
@@ -101,7 +101,7 @@ promise_test(async t => {
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
-  const operandType = {dataType: 'float32', dimensions: [1]};
+  const operandType = {dataType: 'float32', shape: [1]};
   const lhsOperand = builder.input('lhs', operandType);
   const rhsOperand = builder.input('rhs', operandType);
   const graph =
@@ -109,17 +109,17 @@ promise_test(async t => {
 
   const lhsTensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE,
   });
   const rhsTensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.WRITE,
   });
   const outputTensor = await context.createTensor({
     dataType: 'float32',
-    dimensions: [1],
+    shape: [1],
     usage: MLTensorUsage.READ,
   });
   // Initialize inputs
diff --git a/tests/wpt/tests/webnn/validation_tests/elementwise-binary.https.any.js b/tests/wpt/tests/webnn/validation_tests/elementwise-binary.https.any.js
index fc0616f569b..e578a343468 100644
--- a/tests/wpt/tests/webnn/validation_tests/elementwise-binary.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/elementwise-binary.https.any.js
@@ -24,33 +24,33 @@ const tests = [
     name: '[binary] Test bidirectionally broadcastable dimensions.',
     //  Both inputs have axes of length one which are expanded
     //  during broadcasting.
-    a: {dataType: 'float32', dimensions: [8, 1, 6, 1]},
-    b: {dataType: 'float32', dimensions: [7, 1, 5]},
-    output: {dataType: 'float32', dimensions: [8, 7, 6, 5]}
+    a: {dataType: 'float32', shape: [8, 1, 6, 1]},
+    b: {dataType: 'float32', shape: [7, 1, 5]},
+    output: {dataType: 'float32', shape: [8, 7, 6, 5]}
   },
   {
     name: '[binary] Test unidirectionally broadcastable dimensions.',
     // Input a has a single axis of length one which is
     // expanded during broadcasting.
-    a: {dataType: 'float32', dimensions: [4, 2, 1]},
-    b: {dataType: 'float32', dimensions: [4]},
-    output: {dataType: 'float32', dimensions: [4, 2, 4]}
+    a: {dataType: 'float32', shape: [4, 2, 1]},
+    b: {dataType: 'float32', shape: [4]},
+    output: {dataType: 'float32', shape: [4, 2, 4]}
   },
   {
     name: '[binary] Test scalar broadcasting.',
-    a: {dataType: 'float32', dimensions: [4, 2, 4]},
-    b: {dataType: 'float32', dimensions: []},
-    output: {dataType: 'float32', dimensions: [4, 2, 4]}
+    a: {dataType: 'float32', shape: [4, 2, 4]},
+    b: {dataType: 'float32', shape: []},
+    output: {dataType: 'float32', shape: [4, 2, 4]}
   },
   {
     name: '[binary] Throw if the input shapes are not broadcastable.',
-    a: {dataType: 'float32', dimensions: [4, 2]},
-    b: {dataType: 'float32', dimensions: [4]},
+    a: {dataType: 'float32', shape: [4, 2]},
+    b: {dataType: 'float32', shape: [4]},
   },
   {
     name: '[binary] Throw if the input types don\'t match.',
-    a: {dataType: 'float32', dimensions: [4, 2]},
-    b: {dataType: 'int32', dimensions: [1]},
+    a: {dataType: 'float32', shape: [4, 2]},
+    b: {dataType: 'int32', shape: [1]},
   },
 ];
 
@@ -60,31 +60,21 @@ function runElementWiseBinaryTests(operatorName, tests) {
       const builder = new MLGraphBuilder(context);
       if (!context.opSupportLimits().input.dataTypes.includes(
               test.a.dataType)) {
-        assert_throws_js(
-            TypeError,
-            () => builder.input(
-                'a',
-                {dataType: test.a.dataType, dimensions: test.a.dimensions}));
+        assert_throws_js(TypeError, () => builder.input('a', test.a));
         return;
       }
       if (!context.opSupportLimits().input.dataTypes.includes(
               test.b.dataType)) {
-        assert_throws_js(
-            TypeError,
-            () => builder.input(
-                'b',
-                {dataType: test.b.dataType, dimensions: test.b.dimensions}));
+        assert_throws_js(TypeError, () => builder.input('b', test.b));
         return;
       }
-      const a = builder.input(
-          'a', {dataType: test.a.dataType, dimensions: test.a.dimensions});
-      const b = builder.input(
-          'b', {dataType: test.b.dataType, dimensions: test.b.dimensions});
+      const a = builder.input('a', test.a);
+      const b = builder.input('b', test.b);
 
       if (test.output) {
         const output = builder[operatorName](a, b);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {label};
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/elu.https.any.js b/tests/wpt/tests/webnn/validation_tests/elu.https.any.js
index 4236925aed1..4fe08b1b0ce 100644
--- a/tests/wpt/tests/webnn/validation_tests/elu.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/elu.https.any.js
@@ -17,8 +17,7 @@ validateSingleInputOperation('elu', label);
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: 1.0};
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   const output = builder.elu(input, options);
   assert_equals(output.dataType(), 'float32');
   assert_array_equals(output.shape(), [1, 2, 3]);
@@ -30,8 +29,7 @@ promise_test(async t => {
     alpha: -1.0,
     label: label,
   };
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   assert_throws_with_label(() => builder.elu(input, options), regrexp);
 }, '[elu] Throw if options.alpha < 0');
 
@@ -41,20 +39,20 @@ promise_test(async t => {
     alpha: 0,
     label: label,
   };
-  const input = builder.input('input', {dataType: 'float32', dimensions: [1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1]});
   assert_throws_with_label(() => builder.elu(input, options), regrexp);
 }, '[elu] Throw if options.alpha == 0');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: NaN};
-  const input = builder.input('input', {dataType: 'float16', dimensions: []});
+  const input = builder.input('input', {dataType: 'float16', shape: []});
   assert_throws_js(TypeError, () => builder.elu(input, options));
 }, '[elu] Throw if options.alpha is NaN');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: Infinity};
-  const input = builder.input('input', {dataType: 'float32', dimensions: [1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1]});
   assert_throws_js(TypeError, () => builder.elu(input, options));
 }, '[elu] Throw if options.alpha is Infinity');
diff --git a/tests/wpt/tests/webnn/validation_tests/expand.https.any.js b/tests/wpt/tests/webnn/validation_tests/expand.https.any.js
index 4edc9a718a4..23fe94aedc1 100644
--- a/tests/wpt/tests/webnn/validation_tests/expand.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/expand.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [2, 1, 2]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 1, 2]});
 
   const newShape = [2, 2, 2];
   assert_throws_js(
@@ -21,45 +21,45 @@ const label = 'xxx_expand';
 const tests = [
   {
     name: '[expand] Test with 0-D scalar to 3-D tensor.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     newShape: [3, 4, 5],
-    output: {dataType: 'float32', dimensions: [3, 4, 5]}
+    output: {dataType: 'float32', shape: [3, 4, 5]}
   },
   {
     name: '[expand] Test with the new shapes that are the same as input.',
-    input: {dataType: 'float32', dimensions: [4]},
+    input: {dataType: 'float32', shape: [4]},
     newShape: [4],
-    output: {dataType: 'float32', dimensions: [4]}
+    output: {dataType: 'float32', shape: [4]}
   },
   {
     name: '[expand] Test with the new shapes that are broadcastable.',
-    input: {dataType: 'float32', dimensions: [3, 1, 5]},
+    input: {dataType: 'float32', shape: [3, 1, 5]},
     newShape: [3, 4, 5],
-    output: {dataType: 'float32', dimensions: [3, 4, 5]}
+    output: {dataType: 'float32', shape: [3, 4, 5]}
   },
   {
     name:
         '[expand] Test with the new shapes that are broadcastable and the rank of new shapes is larger than input.',
-    input: {dataType: 'float32', dimensions: [2, 5]},
+    input: {dataType: 'float32', shape: [2, 5]},
     newShape: [3, 2, 5],
-    output: {dataType: 'float32', dimensions: [3, 2, 5]}
+    output: {dataType: 'float32', shape: [3, 2, 5]}
   },
   {
     name:
         '[expand] Throw if the input shapes are the same rank but not broadcastable.',
-    input: {dataType: 'float32', dimensions: [3, 6, 2]},
+    input: {dataType: 'float32', shape: [3, 6, 2]},
     newShape: [4, 3, 5],
     options: {label}
   },
   {
     name: '[expand] Throw if the input shapes are not broadcastable.',
-    input: {dataType: 'float32', dimensions: [5, 4]},
+    input: {dataType: 'float32', shape: [5, 4]},
     newShape: [5],
     options: {label}
   },
   {
     name: '[expand] Throw if the number of new shapes is too large.',
-    input: {dataType: 'float32', dimensions: [1, 2, 1, 1]},
+    input: {dataType: 'float32', shape: [1, 2, 1, 1]},
     newShape: [1, 2, kMaxUnsignedLong, kMaxUnsignedLong],
   },
 ];
@@ -67,14 +67,12 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
 
       if (test.output) {
         const output = builder.expand(input, test.newShape);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {...test.options};
         if (options.label) {
@@ -94,9 +92,9 @@ promise_test(async t => {
       continue;
     }
     const builder = new MLGraphBuilder(context);
-    const dimensions = [1];
+    const shape = [1];
     const newShape = [1, 2, 3];
-    const input = builder.input(`input`, {dataType, dimensions});
+    const input = builder.input(`input`, {dataType, shape});
     if (context.opSupportLimits().expand.input.dataTypes.includes(dataType)) {
       const output = builder.expand(input, newShape);
       assert_equals(output.dataType(), dataType);
diff --git a/tests/wpt/tests/webnn/validation_tests/gather.https.any.js b/tests/wpt/tests/webnn/validation_tests/gather.https.any.js
index ec728314a3c..dbeacbfc279 100644
--- a/tests/wpt/tests/webnn/validation_tests/gather.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/gather.https.any.js
@@ -10,66 +10,62 @@
 const tests = [
   {
     name: '[gather] Test gather with default options and 0-D indices',
-    input: {dataType: 'int32', dimensions: [3]},
-    indices: {dataType: 'int64', dimensions: []},
-    output: {dataType: 'int32', dimensions: []}
+    input: {dataType: 'int32', shape: [3]},
+    indices: {dataType: 'int64', shape: []},
+    output: {dataType: 'int32', shape: []}
   },
   {
     name: '[gather] Test gather with axis = 2',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'int64', dimensions: [5, 6]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'int64', shape: [5, 6]},
     axis: 2,
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 6, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 5, 6, 4]}
   },
   {
     name: '[gather] Test gather with indices\'s dataType = uint32',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'uint32', dimensions: [5, 6]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'uint32', shape: [5, 6]},
     axis: 2,
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 6, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 5, 6, 4]}
   },
   {
     name: '[gather] Test gather with indices\'s dataType = int32',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'int32', dimensions: [5, 6]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'int32', shape: [5, 6]},
     axis: 2,
-    output: {dataType: 'float32', dimensions: [1, 2, 5, 6, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 5, 6, 4]}
   },
   {
     name: '[gather] TypeError is expected if the input is a scalar',
-    input: {dataType: 'float16', dimensions: []},
-    indices: {dataType: 'int64', dimensions: [1]},
+    input: {dataType: 'float16', shape: []},
+    indices: {dataType: 'int64', shape: [1]},
   },
   {
     name:
         '[gather] TypeError is expected if the axis is greater than the rank of input',
-    input: {dataType: 'float16', dimensions: [1, 2, 3]},
-    indices: {dataType: 'int32', dimensions: [5, 6]},
+    input: {dataType: 'float16', shape: [1, 2, 3]},
+    indices: {dataType: 'int32', shape: [5, 6]},
     axis: 4,
   },
   {
     name:
         '[gather] TypeError is expected if the data type of indices is float32 which is invalid',
-    input: {dataType: 'float16', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'float32', dimensions: [5, 6]},
+    input: {dataType: 'float16', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'float32', shape: [5, 6]},
   },
   {
     name:
         '[gather] TypeError is expected if the data type of indices is uint64 which is invalid',
-    input: {dataType: 'float16', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'uint64', dimensions: [5, 6]},
+    input: {dataType: 'float16', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'uint64', shape: [5, 6]},
   }
 ];
 
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const indices = builder.input(
-          'indices',
-          {dataType: test.indices.dataType, dimensions: test.indices.dimensions});
+      const input = builder.input('input', test.input);
+      const indices = builder.input('indices', test.indices);
 
       const options = {};
       if (test.axis) {
@@ -79,7 +75,7 @@ tests.forEach(
       if (test.output) {
         const output = builder.gather(input, indices, options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'gather_'
         options.label = label;
@@ -91,20 +87,18 @@ tests.forEach(
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 2]});
 
-  const indices =
-      builder.input('indices', {dataType: 'int64', dimensions: [2, 2]});
+  const indices = builder.input('indices', {dataType: 'int64', shape: [2, 2]});
   assert_throws_js(
       TypeError, () => builder.gather(inputFromOtherBuilder, indices));
 }, '[gather] throw if input is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const indicesFromOtherBuilder =
-      otherBuilder.input('indices', {dataType: 'int64', dimensions: [2, 2]});
+      otherBuilder.input('indices', {dataType: 'int64', shape: [2, 2]});
 
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+  const input = builder.input('input', {dataType: 'float32', shape: [2, 2]});
   assert_throws_js(
       TypeError, () => builder.gather(input, indicesFromOtherBuilder));
 }, '[gather] throw if indices is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/gatherElements.https.any.js b/tests/wpt/tests/webnn/validation_tests/gatherElements.https.any.js
index ed8af8da330..4c4b04490e8 100644
--- a/tests/wpt/tests/webnn/validation_tests/gatherElements.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/gatherElements.https.any.js
@@ -10,43 +10,43 @@
 const tests = [
   {
     name: '[gatherElements] Test gatherElements with default options',
-    input: {dataType: 'float32', dimensions: [1, 2, 3]},
-    indices: {dataType: 'int32', dimensions: [2, 2, 3]},
-    output: {dataType: 'float32', dimensions: [2, 2, 3]}
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'int32', shape: [2, 2, 3]},
+    output: {dataType: 'float32', shape: [2, 2, 3]}
   },
   {
     name: '[gatherElements] Test gatherElements with axis = 2',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'int32', dimensions: [1, 2, 1, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'int32', shape: [1, 2, 1, 4]},
     axis: 2,
-    output: {dataType: 'float32', dimensions: [1, 2, 1, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 1, 4]}
   },
   {
     name: '[gatherElements] Throw if input is a scalar',
-    input: {dataType: 'float32', dimensions: []},
-    indices: {dataType: 'int32', dimensions: []}
+    input: {dataType: 'float32', shape: []},
+    indices: {dataType: 'int32', shape: []}
   },
   {
     name:
         '[gatherElements] Throw if the axis is greater than the rank of input',
-    input: {dataType: 'float32', dimensions: [1, 2, 3]},
-    indices: {dataType: 'int32', dimensions: [1, 2, 3]},
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'int32', shape: [1, 2, 3]},
     axis: 4
   },
   {
     name: '[gatherElements] Throw if indices data type is float32',
-    input: {dataType: 'float32', dimensions: [1, 2, 3]},
-    indices: {dataType: 'float32', dimensions: [1, 2, 3]}
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'float32', shape: [1, 2, 3]}
   },
   {
     name: '[gatherElements] Throw if input rank is not equal to indices rank',
-    input: {dataType: 'float32', dimensions: [1, 2, 3]},
-    indices: {dataType: 'int32', dimensions: [1, 2]}
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'int32', shape: [1, 2]}
   },
   {
     name: '[gatherElements] Throw if indices shape is incorrect',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    indices: {dataType: 'int32', dimensions: [3, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    indices: {dataType: 'int32', shape: [3, 2, 3, 4]},
     axis: 3
   }
 ];
@@ -54,13 +54,8 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const indices = builder.input('indices', {
-        dataType: test.indices.dataType,
-        dimensions: test.indices.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const indices = builder.input('indices', test.indices);
 
       const options = {};
       if (test.axis) {
@@ -70,7 +65,7 @@ tests.forEach(
       if (test.output) {
         const output = builder.gatherElements(input, indices, options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'gatherElements_'
         options.label = label;
@@ -82,20 +77,18 @@ tests.forEach(
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 2]});
 
-  const indices =
-      builder.input('indices', {dataType: 'int32', dimensions: [2, 2]});
+  const indices = builder.input('indices', {dataType: 'int32', shape: [2, 2]});
   assert_throws_js(
       TypeError, () => builder.gatherElements(inputFromOtherBuilder, indices));
 }, '[gatherElements] Throw if input is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const indicesFromOtherBuilder =
-      otherBuilder.input('indices', {dataType: 'int32', dimensions: [2, 2]});
+      otherBuilder.input('indices', {dataType: 'int32', shape: [2, 2]});
 
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+  const input = builder.input('input', {dataType: 'float32', shape: [2, 2]});
   assert_throws_js(
       TypeError, () => builder.gatherElements(input, indicesFromOtherBuilder));
 }, '[gatherElements] Throw if indices is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/gatherND.https.any.js b/tests/wpt/tests/webnn/validation_tests/gatherND.https.any.js
new file mode 100644
index 00000000000..a8bfa2b336b
--- /dev/null
+++ b/tests/wpt/tests/webnn/validation_tests/gatherND.https.any.js
@@ -0,0 +1,76 @@
+// META: title=validation tests for WebNN API gatherND operation
+// META: global=window,dedicatedworker
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils_validation.js
+
+'use strict';
+
+const tests = [
+  {
+    name: '[gatherND] Test gatherND with 5D input 3D indices',
+    input: {dataType: 'float32', shape: [2, 2, 3, 3, 4]},
+    indices: {dataType: 'int32', shape: [5, 4, 3]},
+    output: {dataType: 'float32', shape: [5, 4, 3, 4]}
+  },
+  {
+    name: '[gatherND] Throw if input is a scalar',
+    input: {dataType: 'float32', shape: []},
+    indices: {dataType: 'int32', shape: [1, 1, 1]}
+  },
+  {
+    name: '[gatherND] Throw if indices is a scalar',
+    input: {dataType: 'float32', shape: [1, 1, 1]},
+    indices: {dataType: 'int32', shape: []}
+  },
+  {
+    name: '[gatherND] Throw if indices data type is float32',
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'float32', shape: [1, 1, 1]},
+  },
+  {
+    name:
+        '[gatherND] Throw if indices.shape[-1] is greater than the input rank',
+    input: {dataType: 'float32', shape: [1, 2, 3]},
+    indices: {dataType: 'int32', shape: [1, 1, 4]}
+  }
+];
+
+tests.forEach(test => promise_test(async t => {
+                const builder = new MLGraphBuilder(context);
+                const input = builder.input('input', test.input);
+                const indices = builder.input('indices', test.indices);
+
+                if (test.output &&
+                    context.opSupportLimits().gatherND.input.dataTypes.includes(
+                        test.input.dataType)) {
+                  const output = builder.gatherND(input, indices);
+                  assert_equals(output.dataType(), test.output.dataType);
+                  assert_array_equals(output.shape(), test.output.shape);
+                } else {
+                  const label = 'gatherND_';
+                  const options = {label: label};
+                  const regexp = new RegExp('\\[' + label + '\\]');
+                  assert_throws_with_label(
+                      () => builder.gatherND(input, indices, options), regexp);
+                }
+              }, test.name));
+
+multi_builder_test(async (t, builder, otherBuilder) => {
+  const inputFromOtherBuilder =
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 2]});
+
+  const indices = builder.input('indices', {dataType: 'int32', shape: [2, 1]});
+  assert_throws_js(
+      TypeError, () => builder.gatherND(inputFromOtherBuilder, indices));
+}, '[gatherND] Throw if input is from another builder');
+
+multi_builder_test(async (t, builder, otherBuilder) => {
+  const indicesFromOtherBuilder =
+      otherBuilder.input('indices', {dataType: 'int32', shape: [2, 2]});
+
+  const input = builder.input('input', {dataType: 'float32', shape: [2, 1]});
+  assert_throws_js(
+      TypeError, () => builder.gatherND(input, indicesFromOtherBuilder));
+}, '[gatherND] Throw if indices is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/gemm.https.any.js b/tests/wpt/tests/webnn/validation_tests/gemm.https.any.js
index 30cddcf5ec5..cad1806b5ff 100644
--- a/tests/wpt/tests/webnn/validation_tests/gemm.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/gemm.https.any.js
@@ -9,7 +9,7 @@
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 2]
+  shape: [2, 2]
 };
 
 validateTwoInputsFromMultipleBuilders('gemm');
@@ -28,31 +28,31 @@ const label = 'gemm_xxx';
 const tests = [
   {
     name: '[gemm] Test building gemm with default option.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
-    output: {dataType: 'float32', dimensions: [2, 4]}
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
+    output: {dataType: 'float32', shape: [2, 4]}
   },
   {
     name:
         '[gemm] Throw if inputShapeA[1] is not equal to inputShapeB[0] default options.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [2, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [2, 4]},
     options: {label}
   },
   {
     name: '[gemm] Test building gemm with aTranspose=true.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [2, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [2, 4]},
     options: {
       aTranspose: true,
     },
-    output: {dataType: 'float32', dimensions: [3, 4]}
+    output: {dataType: 'float32', shape: [3, 4]}
   },
   {
     name:
         '[gemm] Throw if inputShapeA[0] is not equal to inputShapeB[0] with aTranspose=true.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
     options: {
       aTranspose: true,
       label: label,
@@ -60,18 +60,18 @@ const tests = [
   },
   {
     name: '[gemm] Test building gemm with bTranspose=true.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [4, 3]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [4, 3]},
     options: {
       bTranspose: true,
     },
-    output: {dataType: 'float32', dimensions: [2, 4]}
+    output: {dataType: 'float32', shape: [2, 4]}
   },
   {
     name:
         '[gemm] Throw if inputShapeA[0] is not equal to inputShapeB[0] with bTranspose=true.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
     options: {
       bTranspose: true,
       label: label,
@@ -79,63 +79,63 @@ const tests = [
   },
   {
     name: '[gemm] Throw if the rank of inputA is not 2.',
-    a: {dataType: 'float32', dimensions: [2, 3, 1]},
-    b: {dataType: 'float32', dimensions: [2, 4]},
+    a: {dataType: 'float32', shape: [2, 3, 1]},
+    b: {dataType: 'float32', shape: [2, 4]},
     options: {label}
   },
   {
     name: '[gemm] Throw if the rank of inputB is not 2.',
-    a: {dataType: 'float32', dimensions: [2, 4]},
-    b: {dataType: 'float32', dimensions: [2, 3, 1]},
+    a: {dataType: 'float32', shape: [2, 4]},
+    b: {dataType: 'float32', shape: [2, 3, 1]},
     options: {label}
   },
   {
     name: '[gemm] Throw if data types of two inputs do not match.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float16', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float16', shape: [3, 4]},
     options: {label}
   },
   {
     name: '[gemm] Test building gemm with inputC.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
     options: {
-      c: {dataType: 'float32', dimensions: [4]},
+      c: {dataType: 'float32', shape: [4]},
     },
-    output: {dataType: 'float32', dimensions: [2, 4]}
+    output: {dataType: 'float32', shape: [2, 4]}
   },
   {
     name: '[gemm] Test building gemm with scalar inputC.',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
     options: {
-      c: {dataType: 'float32', dimensions: []},
+      c: {dataType: 'float32', shape: []},
     },
-    output: {dataType: 'float32', dimensions: [2, 4]}
+    output: {dataType: 'float32', shape: [2, 4]}
   },
   {
     name:
         '[gemm] Throw if inputShapeC is not unidirectionally broadcastable to the output shape [inputShapeA[0], inputShapeB[1]].',
-    a: {dataType: 'float32', dimensions: [2, 3]},
-    b: {dataType: 'float32', dimensions: [3, 4]},
+    a: {dataType: 'float32', shape: [2, 3]},
+    b: {dataType: 'float32', shape: [3, 4]},
     options: {
-      c: {dataType: 'float32', dimensions: [2, 3]},
+      c: {dataType: 'float32', shape: [2, 3]},
       label: label,
     },
   },
   {
     name: '[gemm] Throw if the input data type is not floating point.',
-    a: {dataType: 'int32', dimensions: [2, 3]},
-    b: {dataType: 'int32', dimensions: [3, 4]},
+    a: {dataType: 'int32', shape: [2, 3]},
+    b: {dataType: 'int32', shape: [3, 4]},
     options: {label}
   },
   {
     name:
         '[gemm] Throw if data type of inputC does not match ones of inputA and inputB.',
-    a: {dataType: 'float32', dimensions: [3, 2]},
-    b: {dataType: 'float32', dimensions: [4, 3]},
+    a: {dataType: 'float32', shape: [3, 2]},
+    b: {dataType: 'float32', shape: [4, 3]},
     options: {
-      c: {dataType: 'float16', dimensions: [2, 4]},
+      c: {dataType: 'float16', shape: [2, 4]},
       aTranspose: true,
       bTranspose: true,
       label: label,
@@ -143,10 +143,10 @@ const tests = [
   },
   {
     name: '[gemm] Throw if the rank of inputC is 3.',
-    a: {dataType: 'float32', dimensions: [3, 2]},
-    b: {dataType: 'float32', dimensions: [4, 3]},
+    a: {dataType: 'float32', shape: [3, 2]},
+    b: {dataType: 'float32', shape: [4, 3]},
     options: {
-      c: {dataType: 'float32', dimensions: [2, 3, 4]},
+      c: {dataType: 'float32', shape: [2, 3, 4]},
       aTranspose: true,
       bTranspose: true,
       label: label,
@@ -157,20 +157,15 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const a = builder.input(
-          'a', {dataType: test.a.dataType, dimensions: test.a.dimensions});
-      const b = builder.input(
-          'b', {dataType: test.b.dataType, dimensions: test.b.dimensions});
+      const a = builder.input('a', test.a);
+      const b = builder.input('b', test.b);
       if (test.options && test.options.c) {
-        test.options.c = builder.input('c', {
-          dataType: test.options.c.dataType,
-          dimensions: test.options.c.dimensions
-        });
+        test.options.c = builder.input('c', test.options.c);
       }
       if (test.output) {
         const output = builder.gemm(a, b, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/gru.https.any.js b/tests/wpt/tests/webnn/validation_tests/gru.https.any.js
index 2b168979d07..158384a4b78 100644
--- a/tests/wpt/tests/webnn/validation_tests/gru.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/gru.https.any.js
@@ -11,40 +11,38 @@ const steps = 2, batchSize = 3, inputSize = 4, hiddenSize = 5, oneDirection = 1,
       bothDirections = 2;
 
 // Dimensions required of required inputs.
-const kValidInputDimensions = [steps, batchSize, inputSize];
-const kValidWeightDimensions = [oneDirection, 3 * hiddenSize, inputSize];
-const kValidRecurrentWeightDimensions =
-    [oneDirection, 3 * hiddenSize, hiddenSize];
+const kValidInputShape = [steps, batchSize, inputSize];
+const kValidWeightShape = [oneDirection, 3 * hiddenSize, inputSize];
+const kValidRecurrentWeightShape = [oneDirection, 3 * hiddenSize, hiddenSize];
 // Dimensions required of optional inputs.
-const kValidBiasDimensions = [oneDirection, 3 * hiddenSize];
-const kValidRecurrentBiasDimensions = [oneDirection, 3 * hiddenSize];
-const kValidInitialHiddenStateDimensions =
-    [oneDirection, batchSize, hiddenSize];
+const kValidBiasShape = [oneDirection, 3 * hiddenSize];
+const kValidRecurrentBiasShape = [oneDirection, 3 * hiddenSize];
+const kValidInitialHiddenStateShape = [oneDirection, batchSize, hiddenSize];
 
 // Example descriptors which are valid according to the above dimensions.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInputDimensions
+  shape: kValidInputShape
 };
 const kExampleWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidWeightDimensions
+  shape: kValidWeightShape
 };
 const kExampleRecurrentWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentWeightDimensions
+  shape: kValidRecurrentWeightShape
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidBiasDimensions
+  shape: kValidBiasShape
 };
 const kExampleRecurrentBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentBiasDimensions
+  shape: kValidRecurrentBiasShape
 };
 const kExampleInitialHiddenStateDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInitialHiddenStateDimensions
+  shape: kValidInitialHiddenStateShape
 };
 
 const tests = [
@@ -55,31 +53,28 @@ const tests = [
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
     hiddenSize: hiddenSize,
-    outputs: [
-      {dataType: 'float32', dimensions: [oneDirection, batchSize, hiddenSize]}
-    ]
+    outputs:
+        [{dataType: 'float32', shape: [oneDirection, batchSize, hiddenSize]}]
   },
   {
     name: '[gru] Test with given options',
     input: kExampleInputDescriptor,
     weight: {
       dataType: 'float32',
-      dimensions: [bothDirections, 3 * hiddenSize, inputSize]
+      shape: [bothDirections, 3 * hiddenSize, inputSize]
     },
     recurrentWeight: {
       dataType: 'float32',
-      dimensions: [bothDirections, 3 * hiddenSize, hiddenSize]
+      shape: [bothDirections, 3 * hiddenSize, hiddenSize]
     },
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
-      bias: {dataType: 'float32', dimensions: [bothDirections, 3 * hiddenSize]},
+      bias: {dataType: 'float32', shape: [bothDirections, 3 * hiddenSize]},
       recurrentBias:
-          {dataType: 'float32', dimensions: [bothDirections, 3 * hiddenSize]},
-      initialHiddenState: {
-        dataType: 'float32',
-        dimensions: [bothDirections, batchSize, hiddenSize]
-      },
+          {dataType: 'float32', shape: [bothDirections, 3 * hiddenSize]},
+      initialHiddenState:
+          {dataType: 'float32', shape: [bothDirections, batchSize, hiddenSize]},
       restAfter: true,
       returnSequence: true,
       direction: 'both',
@@ -87,26 +82,20 @@ const tests = [
       activations: ['sigmoid', 'relu']
     },
     outputs: [
-      {
+      {dataType: 'float32', shape: [bothDirections, batchSize, hiddenSize]}, {
         dataType: 'float32',
-        dimensions: [bothDirections, batchSize, hiddenSize]
-      },
-      {
-        dataType: 'float32',
-        dimensions: [steps, bothDirections, batchSize, hiddenSize]
+        shape: [steps, bothDirections, batchSize, hiddenSize]
       }
     ]
   },
   {
     name: '[gru] TypeError is expected if steps equals to zero',
     input: kExampleInputDescriptor,
-    weight: {
-      dataType: 'float32',
-      dimensions: [oneDirection, 4 * hiddenSize, inputSize]
-    },
+    weight:
+        {dataType: 'float32', shape: [oneDirection, 4 * hiddenSize, inputSize]},
     recurrentWeight: {
       dataType: 'float32',
-      dimensions: [oneDirection, 4 * hiddenSize, hiddenSize]
+      shape: [oneDirection, 4 * hiddenSize, hiddenSize]
     },
     steps: 0,
     hiddenSize: hiddenSize,
@@ -130,16 +119,23 @@ const tests = [
   {
     name:
         '[gru] TypeError is expected if the data type of the inputs is not one of the floating point types',
-    input: {dataType: 'uint32', dimensions: kValidInputDimensions},
-    weight: {dataType: 'uint32', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'uint32', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'uint32', shape: kValidInputShape},
+    weight: {dataType: 'uint32', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'uint32', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize
   },
   {
     name: '[gru] TypeError is expected if the rank of input is not 3',
-    input: {dataType: 'float32', dimensions: [steps, batchSize]},
+    input: {dataType: 'float32', shape: [steps, batchSize]},
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    steps: steps,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gru] TypeError is expected if input.shape[0] is not equal to steps',
+    input: {dataType: 'float32', shape: [1000, batchSize, inputSize]},
     weight: kExampleWeightDescriptor,
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
@@ -147,21 +143,10 @@ const tests = [
   },
   {
     name:
-        '[gru] TypeError is expected if input.dimensions[0] is not equal to steps',
-    input: {dataType: 'float32', dimensions: [1000, batchSize, inputSize]},
-    weight: kExampleWeightDescriptor,
-    recurrentWeight: kExampleRecurrentWeightDescriptor,
-    steps: steps,
-    hiddenSize: hiddenSize
-  },
-  {
-    name:
-        '[gru] TypeError is expected if weight.dimensions[1] is not 3 * hiddenSize',
+        '[gru] TypeError is expected if weight.shape[1] is not 3 * hiddenSize',
     input: kExampleInputDescriptor,
-    weight: {
-      dataType: 'float32',
-      dimensions: [oneDirection, 4 * hiddenSize, inputSize]
-    },
+    weight:
+        {dataType: 'float32', shape: [oneDirection, 4 * hiddenSize, inputSize]},
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
     hiddenSize: hiddenSize
@@ -171,19 +156,16 @@ const tests = [
     input: kExampleInputDescriptor,
     weight: kExampleWeightDescriptor,
     recurrentWeight:
-        {dataType: 'float32', dimensions: [oneDirection, 3 * hiddenSize]},
+        {dataType: 'float32', shape: [oneDirection, 3 * hiddenSize]},
     steps: steps,
     hiddenSize: hiddenSize
   },
   {
-    name:
-        '[gru] TypeError is expected if the recurrentWeight.dimensions is invalid',
+    name: '[gru] TypeError is expected if the recurrentWeight.shape is invalid',
     input: kExampleInputDescriptor,
     weight: kExampleWeightDescriptor,
-    recurrentWeight: {
-      dataType: 'float32',
-      dimensions: [oneDirection, 4 * hiddenSize, inputSize]
-    },
+    recurrentWeight:
+        {dataType: 'float32', shape: [oneDirection, 4 * hiddenSize, inputSize]},
     steps: steps,
     hiddenSize: hiddenSize
   },
@@ -204,77 +186,70 @@ const tests = [
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
     hiddenSize: hiddenSize,
-    options: {bias: {dataType: 'float32', dimensions: [oneDirection]}}
+    options: {bias: {dataType: 'float32', shape: [oneDirection]}}
   },
   {
     name:
-        '[gru] TypeError is expected if options.bias.dimensions[1] is not 3 * hiddenSize',
+        '[gru] TypeError is expected if options.bias.shape[1] is not 3 * hiddenSize',
     input: kExampleInputDescriptor,
     weight: kExampleWeightDescriptor,
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
     hiddenSize: hiddenSize,
-    options:
-        {bias: {dataType: 'float32', dimensions: [oneDirection, hiddenSize]}}
+    options: {bias: {dataType: 'float32', shape: [oneDirection, hiddenSize]}}
   },
   {
     name:
-        '[gru] TypeError is expected if options.recurrentBias.dimensions[1] is not 3 * hiddenSize',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+        '[gru] TypeError is expected if options.recurrentBias.shape[1] is not 3 * hiddenSize',
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
       recurrentBias:
-          {dataType: 'float16', dimensions: [oneDirection, 4 * hiddenSize]}
+          {dataType: 'float16', shape: [oneDirection, 4 * hiddenSize]}
     }
   },
   {
     name:
         '[gru] TypeError is expected if the rank of options.initialHiddenState is not 3',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
       initialHiddenState:
-          {dataType: 'float16', dimensions: [oneDirection, batchSize]}
+          {dataType: 'float16', shape: [oneDirection, batchSize]}
     }
   },
   {
     name:
-        '[gru] TypeError is expected if options.initialHiddenState.dimensions[2] is not inputSize',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+        '[gru] TypeError is expected if options.initialHiddenState.shape[2] is not inputSize',
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
       initialHiddenState: {
         dataType: 'float16',
-        dimensions: [oneDirection, batchSize, 3 * hiddenSize]
+        shape: [oneDirection, batchSize, 3 * hiddenSize]
       }
     }
   },
   {
     name:
         '[gru] TypeError is expected if the dataType of options.initialHiddenState is incorrect',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
-      initialHiddenState: {
-        dataType: 'uint64',
-        dimensions: [oneDirection, batchSize, hiddenSize]
-      }
+      initialHiddenState:
+          {dataType: 'uint64', shape: [oneDirection, batchSize, hiddenSize]}
     }
   }
 ];
@@ -282,36 +257,23 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const weight = builder.input(
-          'weight',
-          {dataType: test.weight.dataType, dimensions: test.weight.dimensions});
-      const recurrentWeight = builder.input('recurrentWeight', {
-        dataType: test.recurrentWeight.dataType,
-        dimensions: test.recurrentWeight.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const weight = builder.input('weight', test.weight);
+      const recurrentWeight =
+          builder.input('recurrentWeight', test.recurrentWeight);
 
       const options = {};
       if (test.options) {
         if (test.options.bias) {
-          options.bias = builder.input('bias', {
-            dataType: test.options.bias.dataType,
-            dimensions: test.options.bias.dimensions
-          });
+          options.bias = builder.input('bias', test.options.bias);
         }
         if (test.options.recurrentBias) {
-          options.recurrentBias = builder.input('recurrentBias', {
-            dataType: test.options.recurrentBias.dataType,
-            dimensions: test.options.recurrentBias.dimensions
-          });
+          options.recurrentBias =
+              builder.input('recurrentBias', test.options.recurrentBias);
         }
         if (test.options.initialHiddenState) {
-          options.initialHiddenState = builder.input('initialHiddenState', {
-            dataType: test.options.initialHiddenState.dataType,
-            dimensions: test.options.initialHiddenState.dimensions
-          });
+          options.initialHiddenState = builder.input(
+              'initialHiddenState', test.options.initialHiddenState);
         }
         if (test.options.resetAfter) {
           options.resetAfter = test.options.resetAfter;
@@ -339,7 +301,7 @@ tests.forEach(
         assert_equals(outputs.length, test.outputs.length);
         for (let i = 0; i < outputs.length; ++i) {
           assert_equals(outputs[i].dataType(), test.outputs[i].dataType);
-          assert_array_equals(outputs[i].shape(), test.outputs[i].dimensions);
+          assert_array_equals(outputs[i].shape(), test.outputs[i].shape);
         }
       } else {
         const label = 'gru_xxx';
diff --git a/tests/wpt/tests/webnn/validation_tests/gruCell.https.any.js b/tests/wpt/tests/webnn/validation_tests/gruCell.https.any.js
index 9c0c6d17cc4..7bbb9afcff0 100644
--- a/tests/wpt/tests/webnn/validation_tests/gruCell.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/gruCell.https.any.js
@@ -10,331 +10,276 @@
 const batchSize = 3, inputSize = 4, hiddenSize = 5;
 
 // Dimensions required of required inputs.
-const kValidInputDimensions = [batchSize, inputSize];
-const kValidWeightDimensions = [3 * hiddenSize, inputSize];
-const kValidRecurrentWeightDimensions = [3 * hiddenSize, hiddenSize];
-const kValidHiddenStateDimensions = [batchSize, hiddenSize];
+const kValidInputShape = [batchSize, inputSize];
+const kValidWeightShape = [3 * hiddenSize, inputSize];
+const kValidRecurrentWeightShape = [3 * hiddenSize, hiddenSize];
+const kValidHiddenStateShape = [batchSize, hiddenSize];
 // Dimensions required of optional inputs.
-const kValidBiasDimensions = [3 * hiddenSize];
-const kValidRecurrentBiasDimensions = [3 * hiddenSize];
+const kValidBiasShape = [3 * hiddenSize];
+const kValidRecurrentBiasShape = [3 * hiddenSize];
 // Dimensions required of required output.
-const kValidOutputDimensions = [batchSize, hiddenSize];
+const kValidOutputShape = [batchSize, hiddenSize];
 
 // Example descriptors which are valid according to the above dimensions.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInputDimensions
+  shape: kValidInputShape
 };
 const kExampleWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidWeightDimensions
+  shape: kValidWeightShape
 };
 const kExampleRecurrentWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentWeightDimensions
+  shape: kValidRecurrentWeightShape
 };
 const kExampleHiddenStateDescriptor = {
   dataType: 'float32',
-  dimensions: kValidHiddenStateDimensions
+  shape: kValidHiddenStateShape
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidBiasDimensions
+  shape: kValidBiasShape
 };
 const kExampleRecurrentBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentBiasDimensions
+  shape: kValidRecurrentBiasShape
 };
 const kExampleOutputDescriptor = {
-    dataType: 'float32',
-    dimensions: kValidOutputDimensions
-  };
+  dataType: 'float32',
+  shape: kValidOutputShape
+};
 
 const tests = [
-    {
-        name: '[gruCell] Test with default options',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        output: kExampleOutputDescriptor
+  {
+    name: '[gruCell] Test with default options',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    output: kExampleOutputDescriptor
+  },
+  {
+    name: '[gruCell] Test with given options',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {
+      bias: kExampleBiasDescriptor,
+      recurrentBias: kExampleRecurrentBiasDescriptor,
+      restAfter: true,
+      layout: 'rzn',
+      activations: ['sigmoid', 'relu']
     },
-    {
-        name: '[gruCell] Test with given options',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: {
-            bias: kExampleBiasDescriptor,
-            recurrentBias: kExampleRecurrentBiasDescriptor,
-            restAfter: true,
-            layout: 'rzn',
-            activations: ['sigmoid', 'relu']
-        },
-        output: kExampleOutputDescriptor
-    },
-    {
-        name: '[gruCell] Throw if hiddenSize equals to zero',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: 0
-    },
-    {
-        name: '[gruCell] Throw if hiddenSize is too large',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: 4294967295,
-    },
-    {
-        name:
-            '[gruCell] Throw if the data type of the inputs is not one of the floating point types',
-        input: { dataType: 'uint32', dimensions: kValidInputDimensions },
-        weight: { dataType: 'uint32', dimensions: kValidWeightDimensions },
-        recurrentWeight: {
-            dataType: 'uint32',
-            dimensions: kValidRecurrentWeightDimensions
-        },
-        hiddenState: {
-            dataType: 'uint32',
-            dimensions: kValidHiddenStateDimensions
-        },
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the rank of input is not 2',
-        input: { dataType: 'float32', dimensions: [batchSize] },
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the input.dimensions[1] is incorrect',
-        input: { dataType: 'float32', dimensions: [inputSize, inputSize] },
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name: '[gruCell] Throw if data type of weight is not one of the floating point types',
-        input: kExampleInputDescriptor,
-        weight: {
-            dataType: 'int8',
-            dimensions: [3 * hiddenSize, inputSize]
-        },
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name: '[gruCell] Throw if rank of weight is not 2',
-        input: kExampleInputDescriptor,
-        weight: {
-            dataType: 'float32',
-            dimensions: [3 * hiddenSize]
-        },
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name: '[gruCell] Throw if weight.dimensions[0] is not 3 * hiddenSize',
-        input: kExampleInputDescriptor,
-        weight: {
-            dataType: 'float32',
-            dimensions: [4 * hiddenSize, inputSize]
-        },
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name: '[gruCell] Throw if data type of recurrentWeight is not one of the floating point types',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: {
-            dataType: 'int32',
-            dimensions: [3 * hiddenSize, hiddenSize]
-        },
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the rank of recurrentWeight is not 2',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight:
-            { dataType: 'float32', dimensions: [3 * hiddenSize] },
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the recurrentWeight.dimensions is invalid',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight:
-            { dataType: 'float32', dimensions: [4 * hiddenSize, inputSize] },
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if data type of hiddenState is not one of the floating point types',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight:
-            kExampleRecurrentWeightDescriptor,
-        hiddenState: {
-            dataType: 'uint32',
-            dimensions: [batchSize, hiddenSize]
-        },
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the rank of hiddenState is not 2',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight:
-            kExampleRecurrentWeightDescriptor,
-        hiddenState: {
-            dataType: 'float32',
-            dimensions: [hiddenSize]
-        },
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the hiddenState.dimensions is invalid',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: {
-            dataType: 'float32',
-            dimensions: [batchSize, 3 * hiddenSize]
-        },
-        hiddenSize: hiddenSize
-    },
-    {
-        name:
-            '[gruCell] Throw if the size of options.activations is not 2',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { activations: ['sigmoid', 'tanh', 'relu'] }
-    },
-    {
-        name:
-            '[gruCell] Throw if data type of options.bias is not one of the floating point types',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { bias: { dataType: 'uint8', dimensions: [3 * hiddenSize] } }
-    },
-    {
-        name:
-            '[gruCell] Throw if the rank of options.bias is not 1',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { bias: { dataType: 'float32', dimensions: [batchSize, 3 * hiddenSize] } }
-    },
-    {
-        name:
-            '[gruCell] Throw if options.bias.dimensions[0] is not 3 * hiddenSize',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { bias: { dataType: 'float32', dimensions: [2 * hiddenSize] } }
-    },
-    {
-        name:
-            '[gruCell] Throw if data type of options.recurrentBias is not one of the floating point types',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { recurrentBias: { dataType: 'int8', dimensions: [3 * hiddenSize] } }
-    },
-    {
-        name:
-            '[gruCell] Throw if the rank of options.recurrentBias is not 1',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: { recurrentBias: { dataType: 'float32', dimensions: [batchSize, 3 * hiddenSize] } }
-    },
-    {
-        name:
-            '[gruCell] Throw if options.recurrentBias.dimensions[0] is not 3 * hiddenSize',
-        input: kExampleInputDescriptor,
-        weight: kExampleWeightDescriptor,
-        recurrentWeight: kExampleRecurrentWeightDescriptor,
-        hiddenState: kExampleHiddenStateDescriptor,
-        hiddenSize: hiddenSize,
-        options: {
-            recurrentBias: { dataType: 'float16', dimensions: [4 * hiddenSize] }
-        }
+    output: kExampleOutputDescriptor
+  },
+  {
+    name: '[gruCell] Throw if hiddenSize equals to zero',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: 0
+  },
+  {
+    name: '[gruCell] Throw if hiddenSize is too large',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: 4294967295,
+  },
+  {
+    name:
+        '[gruCell] Throw if the data type of the inputs is not one of the floating point types',
+    input: {dataType: 'uint32', shape: kValidInputShape},
+    weight: {dataType: 'uint32', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'uint32', shape: kValidRecurrentWeightShape},
+    hiddenState: {dataType: 'uint32', shape: kValidHiddenStateShape},
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the rank of input is not 2',
+    input: {dataType: 'float32', shape: [batchSize]},
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the input.shape[1] is incorrect',
+    input: {dataType: 'float32', shape: [inputSize, inputSize]},
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name:
+        '[gruCell] Throw if data type of weight is not one of the floating point types',
+    input: kExampleInputDescriptor,
+    weight: {dataType: 'int8', shape: [3 * hiddenSize, inputSize]},
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if rank of weight is not 2',
+    input: kExampleInputDescriptor,
+    weight: {dataType: 'float32', shape: [3 * hiddenSize]},
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if weight.shape[0] is not 3 * hiddenSize',
+    input: kExampleInputDescriptor,
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name:
+        '[gruCell] Throw if data type of recurrentWeight is not one of the floating point types',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: {dataType: 'int32', shape: [3 * hiddenSize, hiddenSize]},
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the rank of recurrentWeight is not 2',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: {dataType: 'float32', shape: [3 * hiddenSize]},
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the recurrentWeight.shape is invalid',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize
+  },
+  {
+    name:
+        '[gruCell] Throw if data type of hiddenState is not one of the floating point types',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: {dataType: 'uint32', shape: [batchSize, hiddenSize]},
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the rank of hiddenState is not 2',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: {dataType: 'float32', shape: [hiddenSize]},
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the hiddenState.shape is invalid',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: {dataType: 'float32', shape: [batchSize, 3 * hiddenSize]},
+    hiddenSize: hiddenSize
+  },
+  {
+    name: '[gruCell] Throw if the size of options.activations is not 2',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {activations: ['sigmoid', 'tanh', 'relu']}
+  },
+  {
+    name:
+        '[gruCell] Throw if data type of options.bias is not one of the floating point types',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {bias: {dataType: 'uint8', shape: [3 * hiddenSize]}}
+  },
+  {
+    name: '[gruCell] Throw if the rank of options.bias is not 1',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {bias: {dataType: 'float32', shape: [batchSize, 3 * hiddenSize]}}
+  },
+  {
+    name: '[gruCell] Throw if options.bias.shape[0] is not 3 * hiddenSize',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {bias: {dataType: 'float32', shape: [2 * hiddenSize]}}
+  },
+  {
+    name:
+        '[gruCell] Throw if data type of options.recurrentBias is not one of the floating point types',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {recurrentBias: {dataType: 'int8', shape: [3 * hiddenSize]}}
+  },
+  {
+    name: '[gruCell] Throw if the rank of options.recurrentBias is not 1',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {
+      recurrentBias: {dataType: 'float32', shape: [batchSize, 3 * hiddenSize]}
     }
+  },
+  {
+    name:
+        '[gruCell] Throw if options.recurrentBias.shape[0] is not 3 * hiddenSize',
+    input: kExampleInputDescriptor,
+    weight: kExampleWeightDescriptor,
+    recurrentWeight: kExampleRecurrentWeightDescriptor,
+    hiddenState: kExampleHiddenStateDescriptor,
+    hiddenSize: hiddenSize,
+    options: {recurrentBias: {dataType: 'float16', shape: [4 * hiddenSize]}}
+  }
 ];
 
 tests.forEach(
     test =>
         promise_test(async t => {
           const builder = new MLGraphBuilder(context);
-          const input = builder.input('input', {
-            dataType: test.input.dataType,
-            dimensions: test.input.dimensions
-          });
-          const weight = builder.input('weight', {
-            dataType: test.weight.dataType,
-            dimensions: test.weight.dimensions
-          });
-          const recurrentWeight = builder.input('recurrentWeight', {
-            dataType: test.recurrentWeight.dataType,
-            dimensions: test.recurrentWeight.dimensions
-          });
-          const hiddenState = builder.input('hiddenState', {
-            dataType: test.hiddenState.dataType,
-            dimensions: test.hiddenState.dimensions
-          });
+          const input = builder.input('input', test.input);
+          const weight = builder.input('weight', test.weight);
+          const recurrentWeight =
+              builder.input('recurrentWeight', test.recurrentWeight);
+          const hiddenState = builder.input('hiddenState', test.hiddenState);
 
           const options = {};
           if (test.options) {
             if (test.options.bias) {
-              options.bias = builder.input('bias', {
-                dataType: test.options.bias.dataType,
-                dimensions: test.options.bias.dimensions
-              });
+              options.bias = builder.input('bias', test.options.bias);
             }
             if (test.options.recurrentBias) {
-              options.recurrentBias = builder.input('recurrentBias', {
-                dataType: test.options.recurrentBias.dataType,
-                dimensions: test.options.recurrentBias.dimensions
-              });
+              options.recurrentBias =
+                  builder.input('recurrentBias', test.options.recurrentBias);
             }
             if (test.options.resetAfter) {
               options.resetAfter = test.options.resetAfter;
@@ -354,7 +299,7 @@ tests.forEach(
                 input, weight, recurrentWeight, hiddenState, test.hiddenSize,
                 options);
             assert_equals(output.dataType(), test.output.dataType);
-            assert_array_equals(output.shape(), test.output.dimensions);
+            assert_array_equals(output.shape(), test.output.shape);
           } else {
             const label = 'gru_cell_xxx';
             options.label = label;
diff --git a/tests/wpt/tests/webnn/validation_tests/hardSigmoid.https.any.js b/tests/wpt/tests/webnn/validation_tests/hardSigmoid.https.any.js
index c4ea4e1296b..8134863a311 100644
--- a/tests/wpt/tests/webnn/validation_tests/hardSigmoid.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/hardSigmoid.https.any.js
@@ -16,8 +16,7 @@ validateSingleInputOperation('hardSigmoid', label);
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: 0.5, beta: 1.0};
-  const input =
-      builder.input('input', {dataType: 'float16', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float16', shape: [1, 2, 3]});
   const output = builder.hardSigmoid(input, options);
   assert_equals(output.dataType(), 'float16');
   assert_array_equals(output.shape(), [1, 2, 3]);
@@ -26,13 +25,13 @@ promise_test(async t => {
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {beta: NaN};
-  const input = builder.input('input', {dataType: 'float32', dimensions: []});
+  const input = builder.input('input', {dataType: 'float32', shape: []});
   assert_throws_js(TypeError, () => builder.hardSigmoid(input, options));
 }, '[hardSigmoid] Throw if options.beta is NaN');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: Infinity};
-  const input = builder.input('input', {dataType: 'float32', dimensions: [1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1]});
   assert_throws_js(TypeError, () => builder.hardSigmoid(input, options));
 }, '[hardSigmoid] Throw if options.alpha is Infinity');
diff --git a/tests/wpt/tests/webnn/validation_tests/input.https.any.js b/tests/wpt/tests/webnn/validation_tests/input.https.any.js
index 07d9185cee6..0649c67f086 100644
--- a/tests/wpt/tests/webnn/validation_tests/input.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/input.https.any.js
@@ -14,48 +14,48 @@ const tests = [
         '[input] Test building a 0-D scalar input without presenting dimensions',
     name: 'input',
     descriptor: {dataType: 'float32'},
-    output: {dataType: 'float32', dimensions: []},
+    output: {dataType: 'float32', shape: []},
   },
   {
     testName: '[input] Test building a 0-D scalar input with empty dimensions',
     name: 'input',
-    descriptor: {dataType: 'float32', dimensions: []},
-    output: {dataType: 'float32', dimensions: []},
+    descriptor: {dataType: 'float32', shape: []},
+    output: {dataType: 'float32', shape: []},
   },
   {
     testName: '[input] Test building a 1-D input with int64 data type',
     name: 'input',
-    descriptor: {dataType: 'int64', dimensions: [3]},
-    output: {dataType: 'int64', dimensions: [3]},
+    descriptor: {dataType: 'int64', shape: [3]},
+    output: {dataType: 'int64', shape: [3]},
   },
   {
     testName: '[input] Test building a 2-D input without errors',
     name: 'input',
-    descriptor: {dataType: 'float32', dimensions: [3, 4]},
-    output: {dataType: 'float32', dimensions: [3, 4]},
+    descriptor: {dataType: 'float32', shape: [3, 4]},
+    output: {dataType: 'float32', shape: [3, 4]},
   },
   {
     testName: '[input] Throw if the name is empty',
     name: '',
-    descriptor: {dataType: 'float32', dimensions: [3, 4]}
+    descriptor: {dataType: 'float32', shape: [3, 4]}
   },
   {
     testName: '[input] Throw if a dimension size is 0',
     name: 'input',
-    descriptor: {dataType: 'float32', dimensions: [3, 0]}
+    descriptor: {dataType: 'float32', shape: [3, 0]}
   },
   {
     testName:
         '[input] Throw if the value of any element in dimensions is outside the \'unsigned long\' value range',
     name: 'input',
-    descriptor: {dataType: 'float32', dimensions: [kMaxUnsignedLong + 1]}
+    descriptor: {dataType: 'float32', shape: [kMaxUnsignedLong + 1]}
   },
   {
     testName: '[input] Throw if the number of elements is too large',
     name: 'input',
     descriptor: {
       dataType: 'float32',
-      dimensions: [kMaxUnsignedLong, kMaxUnsignedLong, kMaxUnsignedLong]
+      shape: [kMaxUnsignedLong, kMaxUnsignedLong, kMaxUnsignedLong]
     }
   }
 ];
@@ -66,7 +66,7 @@ tests.forEach(
       if (test.output) {
         const inputOperand = builder.input(test.name, test.descriptor);
         assert_equals(inputOperand.dataType(), test.output.dataType);
-        assert_array_equals(inputOperand.shape(), test.output.dimensions);
+        assert_array_equals(inputOperand.shape(), test.output.shape);
       } else {
         assert_throws_js(
             TypeError, () => builder.input(test.name, test.descriptor));
diff --git a/tests/wpt/tests/webnn/validation_tests/instanceNormalization.https.any.js b/tests/wpt/tests/webnn/validation_tests/instanceNormalization.https.any.js
index 36652dd7264..618be23fdec 100644
--- a/tests/wpt/tests/webnn/validation_tests/instanceNormalization.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/instanceNormalization.https.any.js
@@ -9,12 +9,12 @@
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 2, 2, 2]
+  shape: [2, 2, 2, 2]
 };
 // 1D tensor descriptor which may be used for `scale`, or `bias` inputs.
 const kExample1DTensorDescriptor = {
   dataType: 'float32',
-  dimensions: [2]
+  shape: [2]
 };
 
 multi_builder_test(async (t, builder, otherBuilder) => {
@@ -49,128 +49,128 @@ const label = 'instance_normalization';
 const tests = [
   {
     name: '[instanceNormalization] Test with default options for 4-D input.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]}
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]}
   },
   {
     name:
         '[instanceNormalization] Test with scale, bias and default epsilon value.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2]},
-      bias: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       epsilon: 1e-5,
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]}
   },
   {
     name: '[instanceNormalization] Test with a non-default epsilon value.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       epsilon: 1e-4,
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]}
   },
   {
     name: '[instanceNormalization] Test with layout=nhwc.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       layout: 'nhwc',
-      scale: {dataType: 'float32', dimensions: [4]},
-      bias: {dataType: 'float32', dimensions: [4]},
+      scale: {dataType: 'float32', shape: [4]},
+      bias: {dataType: 'float32', shape: [4]},
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]}
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]}
   },
   {
     name: '[instanceNormalization] Test when the input data type is float16.',
-    input: {dataType: 'float16', dimensions: [1, 2, 3, 4]},
-    output: {dataType: 'float16', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float16', shape: [1, 2, 3, 4]},
+    output: {dataType: 'float16', shape: [1, 2, 3, 4]},
     options: {label}
   },
   {
     name: '[instanceNormalization] Throw if the input is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5, 2]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5, 2]},
     options: {label}
   },
   {
     name:
         '[instanceNormalization] Throw if the input data type is not one of floating point types.',
-    input: {dataType: 'int32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'int32', shape: [1, 2, 5, 5]},
     options: {label}
   },
   {
     name:
         '[instanceNormalization] Throw if the scale data type is not the same as the input data type.',
-    input: {dataType: 'float16', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float16', shape: [1, 2, 5, 5]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the scale operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2, 1]},
+      scale: {dataType: 'float32', shape: [2, 1]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the size of scale operand is not equal to the size of the feature dimension of the input with layout=nhwc.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       layout: 'nhwc',
-      scale: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the size of scale operand is not equal to the size of the feature dimension of the input with layout=nchw.',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
     options: {
       layout: 'nchw',
-      scale: {dataType: 'float32', dimensions: [2]},
+      scale: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the bias data type is not the same as the input data type.',
-    input: {dataType: 'float16', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float16', shape: [1, 2, 5, 5]},
     options: {
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the bias operand is not a 1-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2, 1]},
+      scale: {dataType: 'float32', shape: [2, 1]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the size of bias operand is not equal to the size of the feature dimension of the input with layout=nhwc.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       layout: 'nhwc',
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
   {
     name:
         '[instanceNormalization] Throw if the size of bias operand is not equal to the size of the feature dimension of the input with layout=nchw.',
-    input: {dataType: 'float32', dimensions: [1, 5, 5, 2]},
+    input: {dataType: 'float32', shape: [1, 5, 5, 2]},
     options: {
       layout: 'nchw',
-      bias: {dataType: 'float32', dimensions: [2]},
+      bias: {dataType: 'float32', shape: [2]},
       label: label,
     },
   },
@@ -179,21 +179,13 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
 
       if (test.options && test.options.bias) {
-        test.options.bias = builder.input('bias', {
-          dataType: test.options.bias.dataType,
-          dimensions: test.options.bias.dimensions
-        });
+        test.options.bias = builder.input('bias', test.options.bias);
       }
       if (test.options && test.options.scale) {
-        test.options.scale = builder.input('scale', {
-          dataType: test.options.scale.dataType,
-          dimensions: test.options.scale.dimensions
-        });
+        test.options.scale = builder.input('scale', test.options.scale);
       }
 
       if (test.output &&
@@ -202,7 +194,7 @@ tests.forEach(
                   test.input.dataType)) {
         const output = builder.instanceNormalization(input, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/invalid-rank.https.any.js b/tests/wpt/tests/webnn/validation_tests/invalid-rank.https.any.js
index 59f5ac52337..93dfa105c6b 100644
--- a/tests/wpt/tests/webnn/validation_tests/invalid-rank.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/invalid-rank.https.any.js
@@ -11,6 +11,6 @@ promise_test(async t => {
   const shapeWithLargeRank = Array(10).fill(2);
   assert_throws_js(
       TypeError,
-      () => builder.input(
-          'a', {dataType: 'float32', dimensions: shapeWithLargeRank}));
+      () =>
+          builder.input('a', {dataType: 'float32', shape: shapeWithLargeRank}));
 }, 'Throw if rank is too large');
diff --git a/tests/wpt/tests/webnn/validation_tests/layerNormalization.https.any.js b/tests/wpt/tests/webnn/validation_tests/layerNormalization.https.any.js
index 2eff16888c2..97bb479f04d 100644
--- a/tests/wpt/tests/webnn/validation_tests/layerNormalization.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/layerNormalization.https.any.js
@@ -9,7 +9,7 @@
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 2]
+  shape: [2, 2]
 };
 
 validateInputFromAnotherBuilder('layerNormalization');
@@ -36,79 +36,79 @@ const label = 'instance_normalization';
 const tests = [
   {
     name: '[layerNormalization] Test with default options for scalar input.',
-    input: {dataType: 'float32', dimensions: []},
-    output: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
+    output: {dataType: 'float32', shape: []},
   },
   {
     name: '[layerNormalization] Test when the input data type is float16.',
-    input: {dataType: 'float16', dimensions: []},
-    output: {dataType: 'float16', dimensions: []},
+    input: {dataType: 'float16', shape: []},
+    output: {dataType: 'float16', shape: []},
     options: {label}
   },
   {
     name: '[layerNormalization] Test with given axes.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       axes: [3],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]},
   },
   {
     name: '[layerNormalization] Test with given scale.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2, 3, 4]},
+      scale: {dataType: 'float32', shape: [2, 3, 4]},
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]},
   },
   {
     name: '[layerNormalization] Test with a non-default epsilon value.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       epsilon: 1e-4,  // default epsilon=1e-5
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]},
   },
   {
     name: '[layerNormalization] Test with given axes, scale and bias.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
-      scale: {dataType: 'float32', dimensions: [3, 4]},
-      bias: {dataType: 'float32', dimensions: [3, 4]},
+      scale: {dataType: 'float32', shape: [3, 4]},
+      bias: {dataType: 'float32', shape: [3, 4]},
       axes: [2, 3],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]},
   },
   {
     name: '[layerNormalization] Test with nonconsecutive axes.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4, 5, 6]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4, 5, 6]},
     options: {
-      scale: {dataType: 'float32', dimensions: [2, 4, 6]},
-      bias: {dataType: 'float32', dimensions: [2, 4, 6]},
+      scale: {dataType: 'float32', shape: [2, 4, 6]},
+      bias: {dataType: 'float32', shape: [2, 4, 6]},
       axes: [1, 3, 5],
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4, 5, 6]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4, 5, 6]},
   },
   {
     name: '[layerNormalization] Test with axes in descending order.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4, 5, 6]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4, 5, 6]},
     options: {
-      scale: {dataType: 'float32', dimensions: [6, 5, 4, 3, 2]},
-      bias: {dataType: 'float32', dimensions: [6, 5, 4, 3, 2]},
+      scale: {dataType: 'float32', shape: [6, 5, 4, 3, 2]},
+      bias: {dataType: 'float32', shape: [6, 5, 4, 3, 2]},
       axes: [5, 4, 3, 2, 1]
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4, 5, 6]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4, 5, 6]},
   },
   {
     name:
         '[layerNormalization] Throw if the input data type is not one of the floating point types.',
-    input: {dataType: 'uint32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'uint32', shape: [1, 2, 3, 4]},
     options: {label}
   },
   {
     name:
         '[layerNormalization] Throw if the axis is greater than the input rank.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       axes: [1, 2, 4],
       label: label,
@@ -116,7 +116,7 @@ const tests = [
   },
   {
     name: '[layerNormalization] Throw if the axes have duplications.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       axes: [3, 3],
       label: label,
@@ -125,10 +125,10 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the bias data type doesn\'t match input data type',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
-      scale: {dataType: 'float32', dimensions: [3, 4]},
-      bias: {dataType: 'float16', dimensions: [3, 4]},
+      scale: {dataType: 'float32', shape: [3, 4]},
+      bias: {dataType: 'float16', shape: [3, 4]},
       axes: [2, 3],
       label: label,
     },
@@ -136,10 +136,10 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the scale data type doesn\'t match input data type',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
-      scale: {dataType: 'float16', dimensions: [3, 4]},
-      bias: {dataType: 'float32', dimensions: [3, 4]},
+      scale: {dataType: 'float16', shape: [3, 4]},
+      bias: {dataType: 'float32', shape: [3, 4]},
       axes: [2, 3],
       label: label,
     },
@@ -147,11 +147,11 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the bias dimensions doesn\'t match axis dimensions.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       bias: {
         dataType: 'float32',
-        dimensions: [3, 3, 4]
+        shape: [3, 3, 4]
       },  // for 4D input, default axes = [1,2,3]
       label: label,
     },
@@ -159,11 +159,11 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the scale dimensions doesn\'t match axis dimensions.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       scale: {
         dataType: 'float32',
-        dimensions: [3, 3, 4]
+        shape: [3, 3, 4]
       },  // for 4D input, default axes = [1,2,3]
       label: label,
     },
@@ -171,11 +171,11 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the bias rank doesn\'t match axis rank.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       bias: {
         dataType: 'float32',
-        dimensions: [1, 2, 3, 4]
+        shape: [1, 2, 3, 4]
       },  // for 4D input, default axes = [1,2,3]
       label: label,
     },
@@ -183,11 +183,11 @@ const tests = [
   {
     name:
         '[layerNormalization] Throw if the scale rank doesn\'t match axis rank.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       scale: {
         dataType: 'float32',
-        dimensions: [1, 2, 3, 4]
+        shape: [1, 2, 3, 4]
       },  // for 4D input, default axes = [1,2,3]
       label: label,
     },
@@ -197,21 +197,13 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
 
       if (test.options && test.options.bias) {
-        test.options.bias = builder.input('bias', {
-          dataType: test.options.bias.dataType,
-          dimensions: test.options.bias.dimensions
-        });
+        test.options.bias = builder.input('bias', test.options.bias);
       }
       if (test.options && test.options.scale) {
-        test.options.scale = builder.input('scale', {
-          dataType: test.options.scale.dataType,
-          dimensions: test.options.scale.dimensions
-        });
+        test.options.scale = builder.input('scale', test.options.scale);
       }
 
       if (test.output &&
@@ -219,7 +211,7 @@ tests.forEach(
               test.input.dataType)) {
         const output = builder.layerNormalization(input, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/leakyRelu.https.any.js b/tests/wpt/tests/webnn/validation_tests/leakyRelu.https.any.js
index 6766763cd74..c49ac659ef4 100644
--- a/tests/wpt/tests/webnn/validation_tests/leakyRelu.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/leakyRelu.https.any.js
@@ -15,8 +15,7 @@ validateSingleInputOperation('leakyRelu', label);
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: 0.02};
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   const output = builder.leakyRelu(input, options);
   assert_equals(output.dataType(), 'float32');
   assert_array_equals(output.shape(), [1, 2, 3]);
@@ -25,13 +24,13 @@ promise_test(async t => {
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: Infinity};
-  const input = builder.input('input', {dataType: 'float16', dimensions: []});
+  const input = builder.input('input', {dataType: 'float16', shape: []});
   assert_throws_js(TypeError, () => builder.leakyRelu(input, options));
 }, '[leakyRelu] Throw if options.alpha is Infinity');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: -NaN};
-  const input = builder.input('input', {dataType: 'float32', dimensions: [1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1]});
   assert_throws_js(TypeError, () => builder.leakyRelu(input, options));
 }, '[leakyRelu] Throw if options.alpha is -NaN');
diff --git a/tests/wpt/tests/webnn/validation_tests/linear.https.any.js b/tests/wpt/tests/webnn/validation_tests/linear.https.any.js
index e1243bb73fd..816dad35039 100644
--- a/tests/wpt/tests/webnn/validation_tests/linear.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/linear.https.any.js
@@ -15,8 +15,7 @@ validateSingleInputOperation('linear', label);
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: 1.5, beta: 0.3};
-  const input =
-      builder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
   const output = builder.linear(input, options);
   assert_equals(output.dataType(), 'float32');
   assert_array_equals(output.shape(), [1, 2, 3]);
@@ -25,13 +24,13 @@ promise_test(async t => {
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {beta: -Infinity};
-  const input = builder.input('input', {dataType: 'float32', dimensions: []});
+  const input = builder.input('input', {dataType: 'float32', shape: []});
   assert_throws_js(TypeError, () => builder.linear(input, options));
 }, '[linear] Throw if options.beta is -Infinity');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const options = {alpha: NaN};
-  const input = builder.input('input', {dataType: 'float32', dimensions: [1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [1]});
   assert_throws_js(TypeError, () => builder.linear(input, options));
 }, '[linear] Throw if options.alpha is NaN');
diff --git a/tests/wpt/tests/webnn/validation_tests/lstm.https.any.js b/tests/wpt/tests/webnn/validation_tests/lstm.https.any.js
index 5d4f7ee6db2..8cc2a014a7c 100644
--- a/tests/wpt/tests/webnn/validation_tests/lstm.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/lstm.https.any.js
@@ -11,54 +11,51 @@ const steps = 10, batchSize = 5, inputSize = 3, hiddenSize = 8,
       numDirections = 1;
 
 // Dimensions required of required inputs.
-const kValidInputDimensions = [steps, batchSize, inputSize];
-const kValidWeightDimensions = [numDirections, 4 * hiddenSize, inputSize];
-const kValidRecurrentWeightDimensions =
-    [numDirections, 4 * hiddenSize, hiddenSize];
+const kValidInputShape = [steps, batchSize, inputSize];
+const kValidWeightShape = [numDirections, 4 * hiddenSize, inputSize];
+const kValidRecurrentWeightShape = [numDirections, 4 * hiddenSize, hiddenSize];
 // Dimensions required of optional inputs.
-const kValidBiasDimensions = [numDirections, 4 * hiddenSize];
-const kValidPeepholeWeightDimensions = [numDirections, 3 * hiddenSize];
-const kValidInitialHiddenStateDimensions =
-    [numDirections, batchSize, hiddenSize];
+const kValidBiasShape = [numDirections, 4 * hiddenSize];
+const kValidPeepholeWeightShape = [numDirections, 3 * hiddenSize];
+const kValidInitialHiddenStateShape = [numDirections, batchSize, hiddenSize];
 
 // Example descriptors which are valid according to the above dimensions.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInputDimensions
+  shape: kValidInputShape
 };
 const kExampleWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidWeightDimensions
+  shape: kValidWeightShape
 };
 const kExampleRecurrentWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentWeightDimensions
+  shape: kValidRecurrentWeightShape
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidBiasDimensions
+  shape: kValidBiasShape
 };
 const kExamplePeepholeWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidPeepholeWeightDimensions
+  shape: kValidPeepholeWeightShape
 };
 const kExampleInitialHiddenStateDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInitialHiddenStateDimensions
+  shape: kValidInitialHiddenStateShape
 };
 
 const tests = [
   {
     name: '[lstm] Test with default options',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     outputs: [
-      {dataType: 'float16', dimensions: [numDirections, batchSize, hiddenSize]},
-      {dataType: 'float16', dimensions: [numDirections, batchSize, hiddenSize]}
+      {dataType: 'float16', shape: [numDirections, batchSize, hiddenSize]},
+      {dataType: 'float16', shape: [numDirections, batchSize, hiddenSize]}
     ]
   },
   {
@@ -66,34 +63,28 @@ const tests = [
     input: kExampleInputDescriptor,
     weight: {
       dataType: 'float32',
-      dimensions: [/*numDirections=*/ 2, 4 * hiddenSize, inputSize]
+      shape: [/*numDirections=*/ 2, 4 * hiddenSize, inputSize]
     },
     recurrentWeight: {
       dataType: 'float32',
-      dimensions: [/*numDirections=*/ 2, 4 * hiddenSize, hiddenSize]
+      shape: [/*numDirections=*/ 2, 4 * hiddenSize, hiddenSize]
     },
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
-      bias: {
-        dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, 4 * hiddenSize]
-      },
-      recurrentBias: {
-        dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, 4 * hiddenSize]
-      },
-      peepholeWeight: {
-        dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, 3 * hiddenSize]
-      },
+      bias:
+          {dataType: 'float32', shape: [/*numDirections=*/ 2, 4 * hiddenSize]},
+      recurrentBias:
+          {dataType: 'float32', shape: [/*numDirections=*/ 2, 4 * hiddenSize]},
+      peepholeWeight:
+          {dataType: 'float32', shape: [/*numDirections=*/ 2, 3 * hiddenSize]},
       initialHiddenState: {
         dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, batchSize, hiddenSize]
+        shape: [/*numDirections=*/ 2, batchSize, hiddenSize]
       },
       initialCellState: {
         dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, batchSize, hiddenSize]
+        shape: [/*numDirections=*/ 2, batchSize, hiddenSize]
       },
       returnSequence: true,
       direction: 'both',
@@ -103,15 +94,15 @@ const tests = [
     outputs: [
       {
         dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, batchSize, hiddenSize]
+        shape: [/*numDirections=*/ 2, batchSize, hiddenSize]
       },
       {
         dataType: 'float32',
-        dimensions: [/*numDirections=*/ 2, batchSize, hiddenSize]
+        shape: [/*numDirections=*/ 2, batchSize, hiddenSize]
       },
       {
         dataType: 'float32',
-        dimensions: [steps, /*numDirections=*/ 2, batchSize, hiddenSize]
+        shape: [steps, /*numDirections=*/ 2, batchSize, hiddenSize]
       }
     ]
   },
@@ -142,16 +133,15 @@ const tests = [
   {
     name:
         '[lstm] TypeError is expected if the data type is not one of the floating point types',
-    input: {dataType: 'uint32', dimensions: kValidInputDimensions},
-    weight: {dataType: 'uint32', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'uint32', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'uint32', shape: kValidInputShape},
+    weight: {dataType: 'uint32', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'uint32', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize
   },
   {
     name: '[lstm] TypeError is expected if the rank of input is not 3',
-    input: {dataType: 'float32', dimensions: [steps, batchSize]},
+    input: {dataType: 'float32', shape: [steps, batchSize]},
     weight: kExampleWeightDescriptor,
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
@@ -159,8 +149,8 @@ const tests = [
   },
   {
     name:
-        '[lstm] TypeError is expected if input.dimensions[0] is not equal to steps',
-    input: {dataType: 'float32', dimensions: [1000, batchSize, inputSize]},
+        '[lstm] TypeError is expected if input.shape[0] is not equal to steps',
+    input: {dataType: 'float32', shape: [1000, batchSize, inputSize]},
     weight: kExampleWeightDescriptor,
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
@@ -169,10 +159,7 @@ const tests = [
   {
     name: '[lstm] TypeError is expected if the shape of weight is incorrect',
     input: kExampleInputDescriptor,
-    weight: {
-      dataType: 'float32',
-      dimensions: [numDirections, 4 * hiddenSize, 1000]
-    },
+    weight: {dataType: 'float32', shape: [numDirections, 4 * hiddenSize, 1000]},
     recurrentWeight: kExampleRecurrentWeightDescriptor,
     steps: steps,
     hiddenSize: hiddenSize
@@ -183,7 +170,7 @@ const tests = [
     input: kExampleInputDescriptor,
     weight: kExampleWeightDescriptor,
     recurrentWeight:
-        {dataType: 'float32', dimensions: [numDirections, 4 * hiddenSize]},
+        {dataType: 'float32', shape: [numDirections, 4 * hiddenSize]},
     steps: steps,
     hiddenSize: hiddenSize
   },
@@ -199,55 +186,48 @@ const tests = [
   },
   {
     name: '[lstm] TypeError is expected if the rank of options.bias is not 2',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
-    options: {bias: {dataType: 'float16', dimensions: [numDirections]}}
+    options: {bias: {dataType: 'float16', shape: [numDirections]}}
   },
   {
     name:
-        '[lstm] TypeError is expected if the shape of options.recurrentBias.dimensions is incorrect',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+        '[lstm] TypeError is expected if the shape of options.recurrentBias.shape is incorrect',
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
-    options: {
-      recurrentBias: {dataType: 'float16', dimensions: [numDirections, 1000]}
-    }
+    options:
+        {recurrentBias: {dataType: 'float16', shape: [numDirections, 1000]}}
   },
   {
     name:
         '[lstm] TypeError is expected if the dataType of options.peepholeWeight is incorrect',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
       peepholeWeight:
-          {dataType: 'float32', dimensions: [numDirections, 3 * hiddenSize]}
+          {dataType: 'float32', shape: [numDirections, 3 * hiddenSize]}
     }
   },
   {
     name:
         '[lstm] TypeError is expected if the dataType of options.initialHiddenState is incorrect',
-    input: {dataType: 'float16', dimensions: kValidInputDimensions},
-    weight: {dataType: 'float16', dimensions: kValidWeightDimensions},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: kValidRecurrentWeightDimensions},
+    input: {dataType: 'float16', shape: kValidInputShape},
+    weight: {dataType: 'float16', shape: kValidWeightShape},
+    recurrentWeight: {dataType: 'float16', shape: kValidRecurrentWeightShape},
     steps: steps,
     hiddenSize: hiddenSize,
     options: {
-      initialHiddenState: {
-        dataType: 'uint64',
-        dimensions: [numDirections, batchSize, hiddenSize]
-      }
+      initialHiddenState:
+          {dataType: 'uint64', shape: [numDirections, batchSize, hiddenSize]}
     }
   },
   {
@@ -260,7 +240,7 @@ const tests = [
     hiddenSize: hiddenSize,
     options: {
       initialCellState:
-          {dataType: 'float32', dimensions: [numDirections, batchSize, 1000]}
+          {dataType: 'float32', shape: [numDirections, batchSize, 1000]}
     }
   }
 ];
@@ -268,48 +248,31 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const weight = builder.input(
-          'weight',
-          {dataType: test.weight.dataType, dimensions: test.weight.dimensions});
-      const recurrentWeight = builder.input('recurrentWeight', {
-        dataType: test.recurrentWeight.dataType,
-        dimensions: test.recurrentWeight.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const weight = builder.input('weight', test.weight);
+      const recurrentWeight =
+          builder.input('recurrentWeight', test.recurrentWeight);
 
       const options = {};
       if (test.options) {
         if (test.options.bias) {
-          options.bias = builder.input('bias', {
-            dataType: test.options.bias.dataType,
-            dimensions: test.options.bias.dimensions
-          });
+          options.bias = builder.input('bias', test.options.bias);
         }
         if (test.options.recurrentBias) {
-          options.recurrentBias = builder.input('recurrentBias', {
-            dataType: test.options.recurrentBias.dataType,
-            dimensions: test.options.recurrentBias.dimensions
-          });
+          options.recurrentBias =
+              builder.input('recurrentBias', test.options.recurrentBias);
         }
         if (test.options.peepholeWeight) {
-          options.peepholeWeight = builder.input('peepholeWeight', {
-            dataType: test.options.peepholeWeight.dataType,
-            dimensions: test.options.peepholeWeight.dimensions
-          });
+          options.peepholeWeight =
+              builder.input('peepholeWeight', test.options.peepholeWeight);
         }
         if (test.options.initialHiddenState) {
-          options.initialHiddenState = builder.input('initialHiddenState', {
-            dataType: test.options.initialHiddenState.dataType,
-            dimensions: test.options.initialHiddenState.dimensions
-          });
+          options.initialHiddenState = builder.input(
+              'initialHiddenState', test.options.initialHiddenState);
         }
         if (test.options.initialCellState) {
-          options.initialCellState = builder.input('initialCellState', {
-            dataType: test.options.initialCellState.dataType,
-            dimensions: test.options.initialCellState.dimensions
-          });
+          options.initialCellState =
+              builder.input('initialCellState', test.options.initialCellState);
         }
         if (test.options.returnSequence) {
           options.returnSequence = test.options.returnSequence;
@@ -334,7 +297,7 @@ tests.forEach(
         assert_equals(outputs.length, test.outputs.length);
         for (let i = 0; i < outputs.length; ++i) {
           assert_equals(outputs[i].dataType(), test.outputs[i].dataType);
-          assert_array_equals(outputs[i].shape(), test.outputs[i].dimensions);
+          assert_array_equals(outputs[i].shape(), test.outputs[i].shape);
         }
       } else {
         const label = 'lstm_xxx';
diff --git a/tests/wpt/tests/webnn/validation_tests/lstmCell.https.any.js b/tests/wpt/tests/webnn/validation_tests/lstmCell.https.any.js
index 59f81fa319a..a739761d56e 100644
--- a/tests/wpt/tests/webnn/validation_tests/lstmCell.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/lstmCell.https.any.js
@@ -10,43 +10,43 @@
 const batchSize = 3, inputSize = 4, hiddenSize = 5;
 
 // Dimensions required of required inputs.
-const kValidInputDimensions = [batchSize, inputSize];
-const kValidWeightDimensions = [4 * hiddenSize, inputSize];
-const kValidRecurrentWeightDimensions = [4 * hiddenSize, hiddenSize];
-const kValidHiddenStateDimensions = [batchSize, hiddenSize];
-const kValidCellStateDimensions = [batchSize, hiddenSize];
+const kValidInputShape = [batchSize, inputSize];
+const kValidWeightShape = [4 * hiddenSize, inputSize];
+const kValidRecurrentWeightShape = [4 * hiddenSize, hiddenSize];
+const kValidHiddenStateShape = [batchSize, hiddenSize];
+const kValidCellStateShape = [batchSize, hiddenSize];
 // Dimensions required of optional inputs.
-const kValidBiasDimensions = [4 * hiddenSize];
-const kValidPeepholeWeightDimensions = [3 * hiddenSize];
+const kValidBiasShape = [4 * hiddenSize];
+const kValidPeepholeWeightShape = [3 * hiddenSize];
 
 // Example descriptors which are valid according to the above dimensions.
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: kValidInputDimensions
+  shape: kValidInputShape
 };
 const kExampleWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidWeightDimensions
+  shape: kValidWeightShape
 };
 const kExampleRecurrentWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidRecurrentWeightDimensions
+  shape: kValidRecurrentWeightShape
 };
 const kExampleHiddenStateDescriptor = {
   dataType: 'float32',
-  dimensions: kValidHiddenStateDimensions
+  shape: kValidHiddenStateShape
 };
 const kExampleCellStateDescriptor = {
   dataType: 'float32',
-  dimensions: kValidCellStateDimensions
+  shape: kValidCellStateShape
 };
 const kExampleBiasDescriptor = {
   dataType: 'float32',
-  dimensions: kValidBiasDimensions
+  shape: kValidBiasShape
 };
 const kExamplePeepholeWeightDescriptor = {
   dataType: 'float32',
-  dimensions: kValidPeepholeWeightDimensions
+  shape: kValidPeepholeWeightShape
 };
 
 multi_builder_test(async (t, builder, otherBuilder) => {
@@ -192,323 +192,293 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 const tests = [
   {
     name: '[lstmCell] Test with default options',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
     outputs: [
-      {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-      {dataType: 'float16', dimensions: [batchSize, hiddenSize]}
+      {dataType: 'float16', shape: [batchSize, hiddenSize]},
+      {dataType: 'float16', shape: [batchSize, hiddenSize]}
     ]
   },
   {
     name: '[lstmCell] Test with given options',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
     options: {
-      bias: {dataType: 'float32', dimensions: [4 * hiddenSize]},
-      recurrentBias: {dataType: 'float32', dimensions: [4 * hiddenSize]},
-      peepholeWeight: {dataType: 'float32', dimensions: [3 * hiddenSize]},
+      bias: {dataType: 'float32', shape: [4 * hiddenSize]},
+      recurrentBias: {dataType: 'float32', shape: [4 * hiddenSize]},
+      peepholeWeight: {dataType: 'float32', shape: [3 * hiddenSize]},
       layout: 'ifgo',
       activations: ['sigmoid', 'relu', 'tanh']
     },
     outputs: [
-      {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-      {dataType: 'float32', dimensions: [batchSize, hiddenSize]}
+      {dataType: 'float32', shape: [batchSize, hiddenSize]},
+      {dataType: 'float32', shape: [batchSize, hiddenSize]}
     ]
   },
   {
     name: '[lstmCell] Throw if hiddenSize is equal to zero',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: 0
   },
   {
     name: '[lstmCell] Throw if hiddenSize is too large',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: 4294967295
   },
   {
     name:
         '[lstmCell] Throw if the input data type is not one of the floating point types',
-    input: {dataType: 'uint32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'uint32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the rank of input is not 2',
-    input: {dataType: 'float32', dimensions: [batchSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the shape of input is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, 1000]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, 1000]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the data type of weight is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the rank of weight is not 2',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize, 1000]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize, 1000]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the shape of weight is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [1000, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [1000, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the data type of recurrentWeight is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the rank of recurrentWeight is not 2',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
     recurrentWeight:
-        {dataType: 'float32', dimensions: [1000, 4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+        {dataType: 'float32', shape: [1000, 4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the shape of recurrentWeight is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight: {dataType: 'float32', dimensions: [1000, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [1000, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the data type of hiddenState is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'int64', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'int64', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the rank of hiddenState is not 2',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the shape of hiddenState is incorrect',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, 1000]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, 1000]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the data type of cellState is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the rank of cellState is not 2',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the shape of cellState is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, 1000]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, 1000]},
     hiddenSize: hiddenSize
   },
   {
     name: '[lstmCell] Throw if the data type of options.bias is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {bias: {dataType: 'int8', dimensions: [4 * hiddenSize]}}
+    options: {bias: {dataType: 'int8', shape: [4 * hiddenSize]}}
   },
   {
     name: '[lstmCell] Throw if the rank of options.bias is not 1',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {bias: {dataType: 'float16', dimensions: [4 * hiddenSize, 1000]}}
+    options: {bias: {dataType: 'float16', shape: [4 * hiddenSize, 1000]}}
   },
   {
     name: '[lstmCell] Throw if the shape of options.bias is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {bias: {dataType: 'float16', dimensions: [1000]}}
+    options: {bias: {dataType: 'float16', shape: [1000]}}
   },
   {
     name:
         '[lstmCell] Throw if the data type of options.recurrentBias is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {recurrentBias: {dataType: 'uint8', dimensions: [4 * hiddenSize]}}
+    options: {recurrentBias: {dataType: 'uint8', shape: [4 * hiddenSize]}}
   },
   {
     name: '[lstmCell] Throw if the rank of options.recurrentBias is not 1',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {
-      recurrentBias: {dataType: 'float16', dimensions: [4 * hiddenSize, 1000]}
-    }
+    options:
+        {recurrentBias: {dataType: 'float16', shape: [4 * hiddenSize, 1000]}}
   },
   {
     name: '[lstmCell] Throw if the shape of options.recurrentBias is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {recurrentBias: {dataType: 'float16', dimensions: [1000]}}
+    options: {recurrentBias: {dataType: 'float16', shape: [1000]}}
   },
   {
     name:
         '[lstmCell] Throw if the data type of options.peepholeWeight is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options:
-        {peepholeWeight: {dataType: 'float32', dimensions: [3 * hiddenSize]}}
+    options: {peepholeWeight: {dataType: 'float32', shape: [3 * hiddenSize]}}
   },
   {
     name: '[lstmCell] Throw if the rank of options.peepholeWeight is not 1',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {peepholeWeight: {dataType: 'float16', dimensions: []}}
+    options: {peepholeWeight: {dataType: 'float16', shape: []}}
   },
   {
     name:
         '[lstmCell] Throw if the shape of options.peepholeWeight is incorrect',
-    input: {dataType: 'float16', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float16', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float16', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float16', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float16', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float16', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float16', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float16', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
-    options: {peepholeWeight: {dataType: 'float16', dimensions: [1000]}}
+    options: {peepholeWeight: {dataType: 'float16', shape: [1000]}}
   },
   {
     name: '[lstmCell] Throw if the size of options.activations is not 3',
-    input: {dataType: 'float32', dimensions: [batchSize, inputSize]},
-    weight: {dataType: 'float32', dimensions: [4 * hiddenSize, inputSize]},
-    recurrentWeight:
-        {dataType: 'float32', dimensions: [4 * hiddenSize, hiddenSize]},
-    hiddenState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
-    cellState: {dataType: 'float32', dimensions: [batchSize, hiddenSize]},
+    input: {dataType: 'float32', shape: [batchSize, inputSize]},
+    weight: {dataType: 'float32', shape: [4 * hiddenSize, inputSize]},
+    recurrentWeight: {dataType: 'float32', shape: [4 * hiddenSize, hiddenSize]},
+    hiddenState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
+    cellState: {dataType: 'float32', shape: [batchSize, hiddenSize]},
     hiddenSize: hiddenSize,
     options: {activations: ['sigmoid', 'tanh', 'sigmoid', 'tanh']}
   }
@@ -517,44 +487,25 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const weight = builder.input(
-          'weight',
-          {dataType: test.weight.dataType, dimensions: test.weight.dimensions});
-      const recurrentWeight = builder.input('recurrentWeight', {
-        dataType: test.recurrentWeight.dataType,
-        dimensions: test.recurrentWeight.dimensions
-      });
-      const hiddenState = builder.input('hiddenState', {
-        dataType: test.hiddenState.dataType,
-        dimensions: test.hiddenState.dimensions
-      });
-      const cellState = builder.input('cellState', {
-        dataType: test.cellState.dataType,
-        dimensions: test.cellState.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const weight = builder.input('weight', test.weight);
+      const recurrentWeight =
+          builder.input('recurrentWeight', test.recurrentWeight);
+      const hiddenState = builder.input('hiddenState', test.hiddenState);
+      const cellState = builder.input('cellState', test.cellState);
 
       const options = {};
       if (test.options) {
         if (test.options.bias) {
-          options.bias = builder.input('bias', {
-            dataType: test.options.bias.dataType,
-            dimensions: test.options.bias.dimensions
-          });
+          options.bias = builder.input('bias', test.options.bias);
         }
         if (test.options.recurrentBias) {
-          options.recurrentBias = builder.input('recurrentBias', {
-            dataType: test.options.recurrentBias.dataType,
-            dimensions: test.options.recurrentBias.dimensions
-          });
+          options.recurrentBias =
+              builder.input('recurrentBias', test.options.recurrentBias);
         }
         if (test.options.peepholeWeight) {
-          options.peepholeWeight = builder.input('peepholeWeight', {
-            dataType: test.options.peepholeWeight.dataType,
-            dimensions: test.options.peepholeWeight.dimensions
-          });
+          options.peepholeWeight =
+              builder.input('peepholeWeight', test.options.peepholeWeight);
         }
         if (test.options.layout) {
           options.layout = test.options.layout;
@@ -573,7 +524,7 @@ tests.forEach(
         assert_equals(outputs.length, test.outputs.length);
         for (let i = 0; i < outputs.length; ++i) {
           assert_equals(outputs[i].dataType(), test.outputs[i].dataType);
-          assert_array_equals(outputs[i].shape(), test.outputs[i].dimensions);
+          assert_array_equals(outputs[i].shape(), test.outputs[i].shape);
         }
       } else {
         const label = 'lstm_cell_xxx';
diff --git a/tests/wpt/tests/webnn/validation_tests/matmul.https.any.js b/tests/wpt/tests/webnn/validation_tests/matmul.https.any.js
index 981d8f35708..4f8a1ee59a3 100644
--- a/tests/wpt/tests/webnn/validation_tests/matmul.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/matmul.https.any.js
@@ -13,32 +13,32 @@ const tests = [
   {
     name: '[matmul] Throw if first input\'s rank is less than 2',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2]},
-      b: {dataType: 'float32', dimensions: [2, 2]}
+      a: {dataType: 'float32', shape: [2]},
+      b: {dataType: 'float32', shape: [2, 2]}
     }
   },
   {
     name: '[matmul] Throw if second input\'s rank is less than 2',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2, 2]},
-      b: {dataType: 'float32', dimensions: [2]}
+      a: {dataType: 'float32', shape: [2, 2]},
+      b: {dataType: 'float32', shape: [2]}
     }
   },
   {
     name: '[matmul] Test with 2-D input and 4-D input',
     inputs: {
-      a: {dataType: 'float32', dimensions: [1, 4]},
-      b: {dataType: 'float32', dimensions: [2, 2, 4, 2]}
+      a: {dataType: 'float32', shape: [1, 4]},
+      b: {dataType: 'float32', shape: [2, 2, 4, 2]}
     },
-    output: {dataType: 'float32', dimensions: [2, 2, 1, 2]}
+    output: {dataType: 'float32', shape: [2, 2, 1, 2]}
   },
   {
     name: '[matmul] Test with 2-D input and 2-D input',
     inputs: {
-      a: {dataType: 'float32', dimensions: [4, 2]},
-      b: {dataType: 'float32', dimensions: [2, 3]}
+      a: {dataType: 'float32', shape: [4, 2]},
+      b: {dataType: 'float32', shape: [2, 3]}
     },
-    output: {dataType: 'float32', dimensions: [4, 3]}
+    output: {dataType: 'float32', shape: [4, 3]}
   },
   {
     // batchShape is a clone of inputShape with the spatial dimensions
@@ -46,10 +46,10 @@ const tests = [
     name:
         '[matmul] Test with 3-D input and 3-D input of broadcastable batchShape',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2, 3, 4]},
-      b: {dataType: 'float32', dimensions: [1, 4, 1]}
+      a: {dataType: 'float32', shape: [2, 3, 4]},
+      b: {dataType: 'float32', shape: [1, 4, 1]}
     },
-    output: {dataType: 'float32', dimensions: [2, 3, 1]}
+    output: {dataType: 'float32', shape: [2, 3, 1]}
   },
   {
     // batchShape is a clone of inputShape with the spatial dimensions
@@ -57,39 +57,39 @@ const tests = [
     name:
         '[matmul] Test with 4-D input and 3-D input of broadcastable batchShape',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2, 2, 3, 4]},
-      b: {dataType: 'float32', dimensions: [1, 4, 5]}
+      a: {dataType: 'float32', shape: [2, 2, 3, 4]},
+      b: {dataType: 'float32', shape: [1, 4, 5]}
     },
-    output: {dataType: 'float32', dimensions: [2, 2, 3, 5]}
+    output: {dataType: 'float32', shape: [2, 2, 3, 5]}
   },
   {
     name: '[matmul] Test with 3-D input and 3-D input',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2, 3, 4]},
-      b: {dataType: 'float32', dimensions: [2, 4, 5]}
+      a: {dataType: 'float32', shape: [2, 3, 4]},
+      b: {dataType: 'float32', shape: [2, 4, 5]}
     },
-    output: {dataType: 'float32', dimensions: [2, 3, 5]}
+    output: {dataType: 'float32', shape: [2, 3, 5]}
   },
   {
     name: '[matmul] Throw if the input data type is not floating point',
     inputs: {
-      a: {dataType: 'uint32', dimensions: [2, 3, 4]},
-      b: {dataType: 'uint32', dimensions: [2, 4, 5]}
+      a: {dataType: 'uint32', shape: [2, 3, 4]},
+      b: {dataType: 'uint32', shape: [2, 4, 5]}
     }
   },
   {
     name: '[matmul] Throw if data type of two inputs don\'t match',
     inputs: {
-      a: {dataType: 'float32', dimensions: [2, 3, 4]},
-      b: {dataType: 'float16', dimensions: [2, 4, 5]}
+      a: {dataType: 'float32', shape: [2, 3, 4]},
+      b: {dataType: 'float16', shape: [2, 4, 5]}
     }
   },
   {
     name:
         '[matmul] Throw if columns of first input\'s shape doesn\'t match the rows of second input\'s shape',
     inputs: {
-      a: {dataType: 'float32', dimensions: /* [rows, columns] */[2, 3]},
-      b: {dataType: 'float32', dimensions: /* [rows, columns] */[2, 4]}
+      a: {dataType: 'float32', shape: /* [rows, columns] */[2, 3]},
+      b: {dataType: 'float32', shape: /* [rows, columns] */[2, 4]}
     },
   },
   {
@@ -97,26 +97,20 @@ const tests = [
     // (last 2 items) removed.
     name: '[matmul] Throw if batchShapes aren\'t bidirectionally broadcastable',
     inputs: {
-      a: {dataType: 'float32', dimensions: [3, 3, 4]},
-      b: {dataType: 'float32', dimensions: [2, 4, 1]}
+      a: {dataType: 'float32', shape: [3, 3, 4]},
+      b: {dataType: 'float32', shape: [2, 4, 1]}
     },
   },
 ];
 
 tests.forEach(test => promise_test(async t => {
                 const builder = new MLGraphBuilder(context);
-                const inputA = builder.input('a', {
-                  dataType: test.inputs.a.dataType,
-                  dimensions: test.inputs.a.dimensions
-                });
-                const inputB = builder.input('b', {
-                  dataType: test.inputs.b.dataType,
-                  dimensions: test.inputs.b.dimensions
-                });
+                const inputA = builder.input('a', test.inputs.a);
+                const inputB = builder.input('b', test.inputs.b);
                 if (test.output) {
                   const output = builder.matmul(inputA, inputB);
                   assert_equals(output.dataType(), test.output.dataType);
-                  assert_array_equals(output.shape(), test.output.dimensions);
+                  assert_array_equals(output.shape(), test.output.shape);
                 } else {
                   const label = 'matmul_123';
                   const options = {label};
diff --git a/tests/wpt/tests/webnn/validation_tests/pad.https.any.js b/tests/wpt/tests/webnn/validation_tests/pad.https.any.js
index 3f5c30b84cb..b45f68ab014 100644
--- a/tests/wpt/tests/webnn/validation_tests/pad.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/pad.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 2]});
 
   const beginningPadding = [1, 1];
   const endingPadding = [1, 1];
@@ -24,18 +24,18 @@ const tests = [
   {
     name:
         '[pad] Test with default options, beginningPadding=[1, 2] and endingPadding=[1, 2].',
-    input: {dataType: 'float32', dimensions: [2, 3]},
+    input: {dataType: 'float32', shape: [2, 3]},
     beginningPadding: [1, 2],
     endingPadding: [1, 2],
     options: {
       mode: 'constant',
       value: 0,
     },
-    output: {dataType: 'float32', dimensions: [4, 7]}
+    output: {dataType: 'float32', shape: [4, 7]}
   },
   {
     name: '[pad] Throw if building pad for scalar input.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     beginningPadding: [],
     endingPadding: [],
     options: {label}
@@ -43,7 +43,7 @@ const tests = [
   {
     name:
         '[pad] Throw if the length of beginningPadding is not equal to the input rank.',
-    input: {dataType: 'float32', dimensions: [2, 3]},
+    input: {dataType: 'float32', shape: [2, 3]},
     beginningPadding: [1],
     endingPadding: [1, 2],
     options: {
@@ -55,7 +55,7 @@ const tests = [
   {
     name:
         '[pad] Throw if the length of endingPadding is not equal to the input rank.',
-    input: {dataType: 'float32', dimensions: [2, 3]},
+    input: {dataType: 'float32', shape: [2, 3]},
     beginningPadding: [1, 0],
     endingPadding: [1, 2, 0],
     options: {
@@ -65,7 +65,7 @@ const tests = [
   },
   {
     name: '[pad] Throw if the padding of one dimension is too large.',
-    input: {dataType: 'float32', dimensions: [2, 3]},
+    input: {dataType: 'float32', shape: [2, 3]},
     beginningPadding: [2294967295, 0],
     endingPadding: [3294967295, 2],
     options: {
@@ -78,14 +78,12 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       if (test.output) {
         const output = builder.pad(
             input, test.beginningPadding, test.endingPadding, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
diff --git a/tests/wpt/tests/webnn/validation_tests/pooling-and-reduction-keep-dims.https.any.js b/tests/wpt/tests/webnn/validation_tests/pooling-and-reduction-keep-dims.https.any.js
index 5a30aaf02be..3beee94cd44 100644
--- a/tests/wpt/tests/webnn/validation_tests/pooling-and-reduction-keep-dims.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/pooling-and-reduction-keep-dims.https.any.js
@@ -25,16 +25,15 @@ promise_test(async t => {
 
   const avgPool2dInputShape = [1, 7, 7, 2048];
   const avgPool2dInput = builder.input(
-      `avgPool2dInput`, {dataType: 'float32', dimensions: avgPool2dInputShape});
+      `avgPool2dInput`, {dataType: 'float32', shape: avgPool2dInputShape});
   const avgPool2dOutput =
       builder.averagePool2d(avgPool2dInput, {layout: 'nhwc'});
   const conv2dFilterShape = [1001, 1, 1, 2048];
   const conv2dFilter = builder.constant(
-      {dataType: 'float32', dimensions: conv2dFilterShape},
+      {dataType: 'float32', shape: conv2dFilterShape},
       new Float32Array(sizeOfShape(conv2dFilterShape)).fill(1));
   const conv2dBias = builder.constant(
-      {dataType: 'float32', dimensions: [1001]},
-      new Float32Array(1001).fill(0.01));
+      {dataType: 'float32', shape: [1001]}, new Float32Array(1001).fill(0.01));
   const conv2dOutput = builder.conv2d(avgPool2dOutput, conv2dFilter, {
     inputLayout: 'nhwc',
     filterLayout: 'ohwi',
@@ -70,17 +69,15 @@ promise_test(async t => {
 
   const reduceMeanInputShape = [1, 7, 7, 2048];
   const reduceMeanInput = builder.input(
-      `reduceMeanInput`,
-      {dataType: 'float32', dimensions: reduceMeanInputShape});
+      `reduceMeanInput`, {dataType: 'float32', shape: reduceMeanInputShape});
   const reduceMeanOutput =
       builder.reduceMean(reduceMeanInput, {axes: [1, 2], keepDimensions: true});
   const conv2dFilterShape = [1001, 1, 1, 2048];
   const conv2dFilter = builder.constant(
-      {dataType: 'float32', dimensions: conv2dFilterShape},
+      {dataType: 'float32', shape: conv2dFilterShape},
       new Float32Array(sizeOfShape(conv2dFilterShape)).fill(1));
   const conv2dBias = builder.constant(
-      {dataType: 'float32', dimensions: [1001]},
-      new Float32Array(1001).fill(0.01));
+      {dataType: 'float32', shape: [1001]}, new Float32Array(1001).fill(0.01));
   const conv2dOutput = builder.conv2d(reduceMeanOutput, conv2dFilter, {
     inputLayout: 'nhwc',
     filterLayout: 'ohwi',
diff --git a/tests/wpt/tests/webnn/validation_tests/pooling.https.any.js b/tests/wpt/tests/webnn/validation_tests/pooling.https.any.js
index 119132cf638..d862d807ab4 100644
--- a/tests/wpt/tests/webnn/validation_tests/pooling.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/pooling.https.any.js
@@ -11,87 +11,87 @@ const kPoolingOperators = ['averagePool2d', 'l2Pool2d', 'maxPool2d'];
 
 kPoolingOperators.forEach((operatorName) => {
   validateInputFromAnotherBuilder(
-      operatorName, {dataType: 'float32', dimensions: [2, 2, 2, 2]});
+      operatorName, {dataType: 'float32', shape: [2, 2, 2, 2]});
 });
 
 const label = 'pool_2d_xxx';
 const tests = [
   {
     name: 'Test pool2d with default options.',
-    input: {dataType: 'float32', dimensions: [1, 3, 4, 4]},
-    output: {dataType: 'float32', dimensions: [1, 3, 1, 1]}
+    input: {dataType: 'float32', shape: [1, 3, 4, 4]},
+    output: {dataType: 'float32', shape: [1, 3, 1, 1]}
   },
   {
     name: 'Test pool2d with windowDimensions',
-    input: {dataType: 'float16', dimensions: [1, 3, 4, 4]},
+    input: {dataType: 'float16', shape: [1, 3, 4, 4]},
     options: {
       windowDimensions: [3, 3],
     },
-    output: {dataType: 'float16', dimensions: [1, 3, 2, 2]}
+    output: {dataType: 'float16', shape: [1, 3, 2, 2]}
   },
   {
     name: 'Test pool2d with padding.',
-    input: {dataType: 'float32', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 3, 5, 5]},
     options: {
       windowDimensions: [5, 5],
       padding: [2, 2, 2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 5, 5]}
+    output: {dataType: 'float32', shape: [1, 3, 5, 5]}
   },
   {
     name: 'Test pool2d with strides.',
-    input: {dataType: 'float16', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float16', shape: [1, 3, 5, 5]},
     options: {
       windowDimensions: [2, 2],
       strides: [2, 2],
     },
-    output: {dataType: 'float16', dimensions: [1, 3, 2, 2]}
+    output: {dataType: 'float16', shape: [1, 3, 2, 2]}
   },
   {
     name: 'Test pool2d with strides and padding.',
-    input: {dataType: 'float32', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 3, 5, 5]},
     options: {
       windowDimensions: [3, 3],
       padding: [1, 1, 1, 1],
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 3]}
   },
   {
     name: 'Test pool2d with strides and asymmetric padding.',
-    input: {dataType: 'float32', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float32', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [2, 1, 2, 1],
       strides: [2, 2],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 4, 4]}
+    output: {dataType: 'float32', shape: [1, 3, 4, 4]}
   },
   {
     name: 'Test pool2d with strides, padding and roundingType="floor".',
-    input: {dataType: 'float32', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float32', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [1, 1, 1, 1],
       strides: [2, 2],
       roundingType: 'floor',
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 3]}
   },
   {
     name: 'Test pool2d with strides, padding and roundingType="ceil".',
-    input: {dataType: 'float16', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float16', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [1, 1, 1, 1],
       strides: [2, 2],
       roundingType: 'ceil',
     },
-    output: {dataType: 'float16', dimensions: [1, 3, 4, 4]}
+    output: {dataType: 'float16', shape: [1, 3, 4, 4]}
   },
   {
     name: 'Test pool2d with explicit outputSizes ignored roundingType',
-    input: {dataType: 'float32', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float32', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [1, 1, 1, 1],
@@ -99,56 +99,56 @@ const tests = [
       roundingType: 'ceil',
       outputSizes: [3, 3],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 3]}
   },
   {
     name: 'Test pool2d with strides, padding and outputSizes=[3, 3].',
-    input: {dataType: 'float32', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float32', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [1, 1, 1, 1],
       strides: [2, 2],
       outputSizes: [3, 3],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 3, 3, 3]}
   },
   {
     name: 'Test pool2d with strides, padding and outputSizes=[4, 4].',
-    input: {dataType: 'float32', dimensions: [1, 3, 7, 7]},
+    input: {dataType: 'float32', shape: [1, 3, 7, 7]},
     options: {
       windowDimensions: [4, 4],
       padding: [1, 1, 1, 1],
       strides: [2, 2],
       outputSizes: [4, 4],
     },
-    output: {dataType: 'float32', dimensions: [1, 3, 4, 4]}
+    output: {dataType: 'float32', shape: [1, 3, 4, 4]}
   },
   {
     name: 'Test pool2d with layout="nchw".',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [3, 3],
       layout: 'nchw',
     },
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 3]}
+    output: {dataType: 'float32', shape: [1, 2, 3, 3]}
   },
   {
     name: 'Test pool2d with layout="nhwc".',
-    input: {dataType: 'float16', dimensions: [1, 5, 5, 2]},
+    input: {dataType: 'float16', shape: [1, 5, 5, 2]},
     options: {
       windowDimensions: [3, 3],
       layout: 'nhwc',
     },
-    output: {dataType: 'float16', dimensions: [1, 3, 3, 2]}
+    output: {dataType: 'float16', shape: [1, 3, 3, 2]}
   },
   {
     name: 'Throw if the input is not a 4-D tensor.',
-    input: {dataType: 'float32', dimensions: [1, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 5, 5]},
     options: {label},
   },
   {
     name: 'Throw if the output sizes is incorrect.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [2, 2],
       padding: [2, 2, 2, 2],
@@ -159,7 +159,7 @@ const tests = [
   },
   {
     name: 'Throw if the length of output sizes is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [2, 2],
       padding: [2, 2, 2, 2],
@@ -170,7 +170,7 @@ const tests = [
   },
   {
     name: 'Throw if outputSizes[0] is not greater than 0.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [2, 2],
       padding: [2, 2, 2, 2],
@@ -181,7 +181,7 @@ const tests = [
   },
   {
     name: 'Throw if outputSizes[1] is not greater than 0.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [2, 2],
       padding: [2, 2, 2, 2],
@@ -192,7 +192,7 @@ const tests = [
   },
   {
     name: 'Throw if the length of window dimensions is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [1, 1, 1, 1],
       label: label,
@@ -200,7 +200,7 @@ const tests = [
   },
   {
     name: 'Throw if any window dimension is lesser than 1.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [0, 2],
       label: label,
@@ -209,7 +209,7 @@ const tests = [
   {
     name:
         'Throw if the input height is too small to fill the pool window height.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [8, 2],
       label: label,
@@ -218,7 +218,7 @@ const tests = [
   {
     name:
         'Throw if the input width is too small to fill the pool window width.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [2, 8],
       label: label,
@@ -226,7 +226,7 @@ const tests = [
   },
   {
     name: 'Throw if the calculated output height is equal to 0.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [6, 3],
       label: label,
@@ -234,7 +234,7 @@ const tests = [
   },
   {
     name: 'Throw if the calculated output width is equal to 0.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       windowDimensions: [3, 6],
       label: label,
@@ -242,7 +242,7 @@ const tests = [
   },
   {
     name: 'Throw if the length of padding is not 4.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       padding: [2, 2],
       label: label,
@@ -250,7 +250,7 @@ const tests = [
   },
   {
     name: 'Throw if the length of strides is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       strides: [2],
       label: label,
@@ -258,7 +258,7 @@ const tests = [
   },
   {
     name: 'Throw if one stride value is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       strides: [0, 2],
       label: label,
@@ -266,7 +266,7 @@ const tests = [
   },
   {
     name: 'Throw if the length of dilations is not 2.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       dilations: [1, 1, 2],
       label: label,
@@ -274,7 +274,7 @@ const tests = [
   },
   {
     name: 'Throw if one dilation value is smaller than 1.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       dilations: [1, 0],
       label: label,
@@ -282,7 +282,7 @@ const tests = [
   },
   {
     name: 'Throw if the padding height value is too large',
-    input: {dataType: 'float32', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 3, 5, 5]},
     options: {
       padding: [kMaxUnsignedLong, kMaxUnsignedLong, 0, 0],
       label: label,
@@ -290,7 +290,7 @@ const tests = [
   },
   {
     name: 'Throw if the padding width value is too large',
-    input: {dataType: 'float32', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 3, 5, 5]},
     options: {
       padding: [0, 0, kMaxUnsignedLong, kMaxUnsignedLong],
       label: label,
@@ -301,14 +301,12 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       kPoolingOperators.forEach((operatorName) => {
         if (test.output) {
           const output = builder[operatorName](input, test.options);
           assert_equals(output.dataType(), test.output.dataType);
-          assert_array_equals(output.shape(), test.output.dimensions);
+          assert_array_equals(output.shape(), test.output.shape);
         } else {
           const regrexp = new RegExp('\\[' + label + '\\]');
           assert_throws_with_label(
@@ -320,8 +318,7 @@ tests.forEach(
 ['int32', 'uint32', 'int8', 'uint8'].forEach(
     dataType => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input', {dataType: dataType, dimensions: [1, 3, 4, 4]});
+      const input = builder.input('input', {dataType, shape: [1, 3, 4, 4]});
       const output = builder.maxPool2d(input);
       assert_equals(output.dataType(), dataType);
       assert_array_equals(output.shape(), [1, 3, 1, 1]);
@@ -330,13 +327,13 @@ tests.forEach(
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const input =
-      builder.input('input', {dataType: 'int64', dimensions: [1, 2, 3, 3]});
+      builder.input('input', {dataType: 'int64', shape: [1, 2, 3, 3]});
   assert_throws_js(TypeError, () => builder.averagePool2d(input));
 }, '[averagePool2d] Throw if the input data type is not floating point');
 
 promise_test(async t => {
   const builder = new MLGraphBuilder(context);
   const input =
-      builder.input('input', {dataType: 'uint8', dimensions: [1, 2, 4, 4]});
+      builder.input('input', {dataType: 'uint8', shape: [1, 2, 4, 4]});
   assert_throws_js(TypeError, () => builder.l2Pool2d(input));
 }, '[l2Pool2d] Throw if the input data type is not floating point');
diff --git a/tests/wpt/tests/webnn/validation_tests/prelu.https.any.js b/tests/wpt/tests/webnn/validation_tests/prelu.https.any.js
index 9c01d6edae3..94eb6995374 100644
--- a/tests/wpt/tests/webnn/validation_tests/prelu.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/prelu.https.any.js
@@ -13,58 +13,54 @@ const tests = [
   {
     name:
         '[prelu] Test slope\'s shape = [3, 2, 5] which is the same as input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'float32', dimensions: [3, 2, 5]},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'float32', shape: [3, 2, 5]},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[prelu] Test slope\'s shape = [5] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'float32', dimensions: [5]},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'float32', shape: [5]},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[prelu] Test slope\'s shape = [] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'float32', dimensions: []},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'float32', shape: []},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[prelu] Test slope\'s shape = [2, 5] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'float32', dimensions: [2, 5]},
-    output: {dataType: 'float32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'float32', shape: [2, 5]},
+    output: {dataType: 'float32', shape: [3, 2, 5]},
   },
   {
     name:
         '[prelu] Throw if the shape of slope is not broadcastable to the shape of input.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'float32', dimensions: [2]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'float32', shape: [2]},
   },
   {
     name:
         '[prelu] Throw if the data type of slope does not match the data type of input.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    slope: {dataType: 'int32', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    slope: {dataType: 'int32', shape: [3, 2, 5]},
   },
 ];
 
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const slope = builder.input(
-          'input',
-          {dataType: test.slope.dataType, dimensions: test.slope.dimensions});
+      const input = builder.input('input', test.input);
+      const slope = builder.input('input', test.slope);
       if (test.output) {
         const output = builder.prelu(input, slope);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'prelu_123';
         const options = {label};
@@ -80,12 +76,12 @@ promise_test(async t => {
       continue;
     }
     const builder = new MLGraphBuilder(context);
-    const dimensions = [1];
-    const input = builder.input(`input`, {dataType, dimensions});
+    const shape = [1];
+    const input = builder.input(`input`, {dataType, shape});
     if (context.opSupportLimits().prelu.input.dataTypes.includes(dataType)) {
       const output = builder.prelu(input, input);
       assert_equals(output.dataType(), dataType);
-      assert_array_equals(output.shape(), dimensions);
+      assert_array_equals(output.shape(), shape);
     } else {
       assert_throws_js(TypeError, () => builder.prelu(input, input));
     }
diff --git a/tests/wpt/tests/webnn/validation_tests/quantizeLinear.https.any.js b/tests/wpt/tests/webnn/validation_tests/quantizeLinear.https.any.js
index 154f455a492..2f0b21d225a 100644
--- a/tests/wpt/tests/webnn/validation_tests/quantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/quantizeLinear.https.any.js
@@ -11,86 +11,79 @@ const tests = [
   {
     name:
         '[quantizeLinear] Test scale\'s shape = [3, 2, 5] and zeroPoint\'s shape = [3, 2, 5] which is the same as input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [3, 2, 5]},
-    zeroPoint: {dataType: 'int8', dimensions: [3, 2, 5]},
-    output: {dataType: 'int8', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [3, 2, 5]},
+    zeroPoint: {dataType: 'int8', shape: [3, 2, 5]},
+    output: {dataType: 'int8', shape: [3, 2, 5]},
   },
   {
     name:
         '[quantizeLinear] Test scale\'s shape = [5] and zeroPoint\'s shape = [5] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
-    output: {dataType: 'int8', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
+    output: {dataType: 'int8', shape: [3, 2, 5]},
   },
   {
     name:
         '[quantizeLinear] Test scale\'s shape = [] and zeroPoint\'s shape = [] which is unidirectionally broadcastable to input\'s shape.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: []},
-    zeroPoint: {dataType: 'int8', dimensions: []},
-    output: {dataType: 'int8', dimensions: [3, 2, 5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: []},
+    zeroPoint: {dataType: 'int8', shape: []},
+    output: {dataType: 'int8', shape: [3, 2, 5]},
   },
   {
     name:
         '[quantizeLinear] Throw if the shape of scale is not broadcastable to the shape of input.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [2]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [2]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
   },
   {
     name:
         '[quantizeLinear] Throw if the shape of zero_point is not broadcastable to the shape of input.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [2]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [2]},
   },
   {
     name:
         '[quantizeLinear] Throw if the data type of input is not the same as scale.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float16', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float16', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
   },
   {
     name: '[quantizeLinear] Throw if the data type of input is not float32.',
-    input: {dataType: 'int32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'int8', dimensions: [5]},
+    input: {dataType: 'int32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'int8', shape: [5]},
   },
   {
     name: '[quantizeLinear] Throw if the data type of scale is not float32.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'int32', dimensions: [5]},
-    zeroPoint: {dataType: 'uint8', dimensions: [5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'int32', shape: [5]},
+    zeroPoint: {dataType: 'uint8', shape: [5]},
   },
   {
     name:
         '[dequantizeLinear] Throw if the data type of zeroPoint is not int8 or uint8.',
-    input: {dataType: 'float32', dimensions: [3, 2, 5]},
-    scale: {dataType: 'float32', dimensions: [5]},
-    zeroPoint: {dataType: 'float16', dimensions: [5]},
+    input: {dataType: 'float32', shape: [3, 2, 5]},
+    scale: {dataType: 'float32', shape: [5]},
+    zeroPoint: {dataType: 'float16', shape: [5]},
   },
 ];
 
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
-      const scale = builder.input(
-          'scale',
-          {dataType: test.scale.dataType, dimensions: test.scale.dimensions});
-      const zeroPoint = builder.input('zeroPoint', {
-        dataType: test.zeroPoint.dataType,
-        dimensions: test.zeroPoint.dimensions
-      });
+      const input = builder.input('input', test.input);
+      const scale = builder.input('scale', test.scale);
+      const zeroPoint = builder.input('zeroPoint', test.zeroPoint);
       if (test.output) {
         const output = builder.quantizeLinear(input, scale, zeroPoint);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'quantize_linear_123';
         const options = {label};
@@ -103,11 +96,11 @@ tests.forEach(
 
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 const kExampleZeroPointDescriptor = {
   dataType: 'int8',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
diff --git a/tests/wpt/tests/webnn/validation_tests/reduction.https.any.js b/tests/wpt/tests/webnn/validation_tests/reduction.https.any.js
index cb0d344b4f1..b56306351f0 100644
--- a/tests/wpt/tests/webnn/validation_tests/reduction.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/reduction.https.any.js
@@ -25,21 +25,21 @@ const label = 'reduce_op_xxx';
 const allReductionOperatorsTests = [
   {
     name: '[reduce] Test reduce with keepDimensions=true.',
-    input: {dataType: 'float32', dimensions: [1, 3, 4, 4]},
+    input: {dataType: 'float32', shape: [1, 3, 4, 4]},
     options: {
       keepDimensions: true,
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 1, 1]}
+    output: {dataType: 'float32', shape: [1, 1, 1, 1]}
   },
   {
     name: '[reduce] Test reduce with axes=[0, 1] and keep_dimensions=false.',
-    input: {dataType: 'float32', dimensions: [1, 3, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 3, 5, 5]},
     options: {axes: [0, 1]},
-    output: {dataType: 'float32', dimensions: [5, 5]}
+    output: {dataType: 'float32', shape: [5, 5]}
   },
   {
     name: '[reduce] Throw if a value in axes is out of range of [0, N-1].',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       axes: [4],
       label: label,
@@ -47,7 +47,7 @@ const allReductionOperatorsTests = [
   },
   {
     name: '[reduce] Throw if the two values are same in axes sequence.',
-    input: {dataType: 'float32', dimensions: [1, 2, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 2, 5, 5]},
     options: {
       axes: [0, 1, 1],
       label: label,
@@ -59,14 +59,12 @@ function runReductionTests(operatorName, tests) {
   tests.forEach(test => {
     promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
 
       if (test.output) {
         const output = builder[operatorName](input, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
         assert_throws_with_label(
@@ -88,7 +86,7 @@ kReductionOperators.forEach((operatorName) => {
         continue;
       }
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(`input`, {dataType, dimensions3D});
+      const input = builder.input(`input`, {dataType, shape: shape3D});
       if (context.opSupportLimits()[operatorName].input.dataTypes.includes(
               dataType)) {
         const output = builder[operatorName](input);
diff --git a/tests/wpt/tests/webnn/validation_tests/resample2d.https.any.js b/tests/wpt/tests/webnn/validation_tests/resample2d.https.any.js
index dd9916aefe0..df2b85d02de 100644
--- a/tests/wpt/tests/webnn/validation_tests/resample2d.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/resample2d.https.any.js
@@ -12,73 +12,73 @@ const label = 'resample-2d';
 const tests = [
   {
     name: '[resample2d] Test building resample2d with default options',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
-    output: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
+    output: {dataType: 'float32', shape: [1, 1, 2, 4]},
   },
   {
     name: '[resample2d] Test building resample2d with scales=[2.0, 2.0]',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {scales: [2.0, 2.0]},
-    output: {dataType: 'float32', dimensions: [1, 1, 4, 8]},
+    output: {dataType: 'float32', shape: [1, 1, 4, 8]},
   },
   {
     name: '[resample2d] Test building resample2d with scales=[0.5, 0.5]',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
     options: {scales: [0.5, 0.5]},
-    output: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    output: {dataType: 'float32', shape: [1, 1, 2, 2]},
   },
   {
     name:
         '[resample2d] Test building resample2d with scales=[0.5, 0.5] and explicit axes=[2, 3]',
-    input: {dataType: 'float32', dimensions: [1, 1, 5, 5]},
+    input: {dataType: 'float32', shape: [1, 1, 5, 5]},
     options: {scales: [0.5, 0.5], axes: [2, 3]},
-    output: {dataType: 'float32', dimensions: [1, 1, 2, 2]},
+    output: {dataType: 'float32', shape: [1, 1, 2, 2]},
   },
   {
     name:
         '[resample2d] Test building resample2d with scales=[1.0, 2.0] and axes=[0, 1]',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {scales: [1.0, 2.0], axes: [0, 1]},
-    output: {dataType: 'float32', dimensions: [1, 2, 2, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 2, 4]},
   },
   {
     name:
         '[resample2d] Test building resample2d with scales=[2.0, 2.0] and axes=[1, 2]',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {scales: [2.0, 2.0], axes: [1, 2]},
-    output: {dataType: 'float32', dimensions: [1, 2, 4, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 4, 4]},
   },
   {
     name:
         '[resample2d] Test building resample2d with sizes=[3, 6] ignored scales',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {scales: [2.0, 2.0], sizes: [3, 6]},
-    output: {dataType: 'float32', dimensions: [1, 1, 3, 6]},
+    output: {dataType: 'float32', shape: [1, 1, 3, 6]},
   },
   {
     name:
         '[resample2d] Test building resample2d with non consecutive axes=[0,2]',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       axes: [0, 2],
       label: label,
     },
-    output: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    output: {dataType: 'float32', shape: [1, 1, 2, 4]},
   },
   {
     name:
         '[resample2d] Throw if the dataType of input is not float32 or float16',
-    input: {dataType: 'int32', dimensions: [2, 4]},
+    input: {dataType: 'int32', shape: [2, 4]},
     options: {label},
   },
   {
     name: '[resample2d] Throw if the rank of input is not 4',
-    input: {dataType: 'float32', dimensions: [2, 4]},
+    input: {dataType: 'float32', shape: [2, 4]},
     options: {label},
   },
   {
     name: '[resample2d] Throw if the length of scales is not 2',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       scales: [1.0, 1.0, 2.0, 2.0],
       label: label,
@@ -86,7 +86,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if any scale value is negative',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       scales: [1.0, -2.0],
       label: label,
@@ -94,7 +94,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if any scale value is 0',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       scales: [0, 2.0],
       label: label,
@@ -102,7 +102,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if the length of sizes is not 2',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       sizes: [1, 1, 4, 6],
       label: label,
@@ -110,7 +110,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if sizes[0] is not a valid dimension',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       sizes: [0, 1],
       label: label,
@@ -118,7 +118,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if sizes[1] is not a valid dimension',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       sizes: [1, 0],
       label: label,
@@ -127,13 +127,13 @@ const tests = [
   {
     name:
         '[resample2d] Throw if any size value is out of \'unsigned long\' value range',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {sizes: [kMaxUnsignedLong + 1, kMaxUnsignedLong + 1]},
   },
   {
     name:
         '[resample2d] Throw if outputHeight being floor(scaleHeight*inputHeight) is too large',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     // The maximum dimension size is kMaxUnsignedLong (2 ** 32 - 1).
     // Here scaleHeight=kMaxUnsignedLong and inputHeight=2,
     // so outputHeight being kMaxUnsignedLong*2 > kMaxUnsignedLong .
@@ -141,7 +141,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if scaleHeight is too small',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     // Here scaleHeight=0.02 and inputHeight=2,
     // so outputHeight would be 0.
     // Link to https://github.com/webmachinelearning/webnn/issues/391.
@@ -153,7 +153,7 @@ const tests = [
   {
     name:
         '[resample2d] Throw if outputWidth being floor(scaleWidth*inputWidth) is too large',
-    input: {dataType: 'float32', dimensions: [1, 1, 4, 2]},
+    input: {dataType: 'float32', shape: [1, 1, 4, 2]},
     // The maximum dimension size is kMaxUnsignedLong (2 ** 32 - 1).
     // Here scaleWidth=kMaxUnsignedLong and inputWidth=2,
     // so outputWidth being kMaxUnsignedLong*2 > kMaxUnsignedLong .
@@ -161,7 +161,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if scaleWidth is too small',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     // Here scaleWidth=0.1 and inputWidth=4,
     // so outputWidth would be 0.
     // Link to https://github.com/webmachinelearning/webnn/issues/391.
@@ -172,7 +172,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if the length of axes is not 2',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       axes: [0, 1, 2],
       label: label,
@@ -181,7 +181,7 @@ const tests = [
   {
     name:
         '[resample2d] Throw if any axis value is greater than or equal to the input rank',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       axes: [3, 4],
       label: label,
@@ -189,7 +189,7 @@ const tests = [
   },
   {
     name: '[resample2d] Throw if the values of axes are same',
-    input: {dataType: 'float32', dimensions: [1, 1, 2, 4]},
+    input: {dataType: 'float32', shape: [1, 1, 2, 4]},
     options: {
       axes: [0, 0],
       label: label,
@@ -200,14 +200,12 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       const options = test.options ?? {};
       if (test.output) {
         const output = builder.resample2d(input, options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {...test.options};
         if (options.label) {
@@ -221,7 +219,7 @@ tests.forEach(
     }, test.name));
 
 validateInputFromAnotherBuilder(
-    'resample2d', {dataType: 'float32', dimensions: [2, 2, 2, 2]});
+    'resample2d', {dataType: 'float32', shape: [2, 2, 2, 2]});
 
 promise_test(async t => {
   for (let dataType of allWebNNOperandDataTypes) {
@@ -229,13 +227,13 @@ promise_test(async t => {
       continue;
     }
     const builder = new MLGraphBuilder(context);
-    const dimensions = [1, 1, 2, 4];
-    const input = builder.input(`input`, {dataType, dimensions});
+    const shape = [1, 1, 2, 4];
+    const input = builder.input(`input`, {dataType, shape});
     if (context.opSupportLimits().resample2d.input.dataTypes.includes(
             dataType)) {
       const output = builder.resample2d(input);
       assert_equals(output.dataType(), dataType);
-      assert_array_equals(output.shape(), dimensions);
+      assert_array_equals(output.shape(), shape);
     } else {
       assert_throws_js(TypeError, () => builder.resample2d(input));
     }
diff --git a/tests/wpt/tests/webnn/validation_tests/reshape.https.any.js b/tests/wpt/tests/webnn/validation_tests/reshape.https.any.js
index 7bf4a523c28..7e49cada67a 100644
--- a/tests/wpt/tests/webnn/validation_tests/reshape.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/reshape.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [1, 2, 3]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [1, 2, 3]});
 
   const newShape = [3, 2, 1];
   assert_throws_js(
@@ -19,49 +19,49 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 const tests = [
   {
     name: '[reshape] Test with new shape=[3, 8].',
-    input: {dataType: 'float32', dimensions: [2, 3, 4]},
+    input: {dataType: 'float32', shape: [2, 3, 4]},
     newShape: [3, 8],
-    output: {dataType: 'float32', dimensions: [3, 8]}
+    output: {dataType: 'float32', shape: [3, 8]}
   },
   {
     name: '[reshape] Test with new shape=[24], src shape=[2, 3, 4].',
-    input: {dataType: 'float32', dimensions: [2, 3, 4]},
+    input: {dataType: 'float32', shape: [2, 3, 4]},
     newShape: [24],
-    output: {dataType: 'float32', dimensions: [24]}
+    output: {dataType: 'float32', shape: [24]}
   },
   {
     name: '[reshape] Test with new shape=[1], src shape=[1].',
-    input: {dataType: 'float32', dimensions: [1]},
+    input: {dataType: 'float32', shape: [1]},
     newShape: [1],
-    output: {dataType: 'float32', dimensions: [1]}
+    output: {dataType: 'float32', shape: [1]}
   },
   {
     name: '[reshape] Test reshaping a 1-D 1-element tensor to scalar.',
-    input: {dataType: 'float32', dimensions: [1]},
+    input: {dataType: 'float32', shape: [1]},
     newShape: [],
-    output: {dataType: 'float32', dimensions: []}
+    output: {dataType: 'float32', shape: []}
   },
   {
     name: '[reshape] Test reshaping a scalar to 1-D 1-element tensor.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     newShape: [1],
-    output: {dataType: 'float32', dimensions: [1]}
+    output: {dataType: 'float32', shape: [1]}
   },
   {
     name: '[reshape] Throw if one value of new shape is 0.',
-    input: {dataType: 'float32', dimensions: [2, 4]},
+    input: {dataType: 'float32', shape: [2, 4]},
     newShape: [2, 4, 0],
   },
   {
     name:
         '[reshape] Throw if the number of elements implied by new shape is not equal to the number of elements in the input tensor when new shape=[].',
-    input: {dataType: 'float32', dimensions: [2, 3, 4]},
+    input: {dataType: 'float32', shape: [2, 3, 4]},
     newShape: [],
   },
   {
     name:
         '[reshape] Throw if the number of elements implied by new shape is not equal to the number of elements in the input tensor.',
-    input: {dataType: 'float32', dimensions: [2, 3, 4]},
+    input: {dataType: 'float32', shape: [2, 3, 4]},
     newShape: [3, 9],
   },
 ];
@@ -69,13 +69,11 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       if (test.output) {
         const output = builder.reshape(input, test.newShape);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'reshape_xxx';
         const options = {label};
diff --git a/tests/wpt/tests/webnn/validation_tests/scatterND.https.any.js b/tests/wpt/tests/webnn/validation_tests/scatterND.https.any.js
index 18fcb40e892..5e28471fffa 100644
--- a/tests/wpt/tests/webnn/validation_tests/scatterND.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/scatterND.https.any.js
@@ -10,43 +10,43 @@
 const tests = [
   {
     name: '[scatterND] Test scatterND with valid tensors',
-    input: {dataType: 'float32', dimensions: [4, 4, 4]},
-    indices: {dataType: 'int32', dimensions: [2, 1]},
-    updates: {dataType: 'float32', dimensions: [2, 4, 4]},
-    output: {dataType: 'float32', dimensions: [4, 4, 4]}
+    input: {dataType: 'float32', shape: [4, 4, 4]},
+    indices: {dataType: 'int32', shape: [2, 1]},
+    updates: {dataType: 'float32', shape: [2, 4, 4]},
+    output: {dataType: 'float32', shape: [4, 4, 4]}
   },
   {
     name:
         '[scatterND] Throw if updates tensor data type is not the same as input data type',
-    input: {dataType: 'float32', dimensions: [4, 4, 4]},
-    indices: {dataType: 'int32', dimensions: [2, 1]},
-    updates: {dataType: 'float16', dimensions: [2, 4, 4]},
+    input: {dataType: 'float32', shape: [4, 4, 4]},
+    indices: {dataType: 'int32', shape: [2, 1]},
+    updates: {dataType: 'float16', shape: [2, 4, 4]},
   },
   {
     name: '[scatterND] Throw if input is a scalar',
-    input: {dataType: 'float32', dimensions: []},
-    indices: {dataType: 'int32', dimensions: [2, 1]},
-    updates: {dataType: 'float32', dimensions: [2, 4, 4]},
+    input: {dataType: 'float32', shape: []},
+    indices: {dataType: 'int32', shape: [2, 1]},
+    updates: {dataType: 'float32', shape: [2, 4, 4]},
   },
   {
     name: '[scatterND] Throw if indices is a scalar',
-    input: {dataType: 'float32', dimensions: [4, 4, 4]},
-    indices: {dataType: 'int32', dimensions: []},
-    updates: {dataType: 'float32', dimensions: [2, 4, 4]},
+    input: {dataType: 'float32', shape: [4, 4, 4]},
+    indices: {dataType: 'int32', shape: []},
+    updates: {dataType: 'float32', shape: [2, 4, 4]},
   },
   {
     name:
         '[scatterND] Throw if the size of last dimension of indices tensor is greater than input rank',
-    input: {dataType: 'float32', dimensions: [4, 4, 4]},
-    indices: {dataType: 'int32', dimensions: [2, 4]},
-    updates: {dataType: 'float32', dimensions: [2, 4, 4]},
+    input: {dataType: 'float32', shape: [4, 4, 4]},
+    indices: {dataType: 'int32', shape: [2, 4]},
+    updates: {dataType: 'float32', shape: [2, 4, 4]},
   },
   {
     name: '[scatterND] Throw if updates tensor shape is invalid.',
-    input: {dataType: 'float32', dimensions: [4, 4, 4]},
-    indices: {dataType: 'int32', dimensions: [2, 1]},
+    input: {dataType: 'float32', shape: [4, 4, 4]},
+    indices: {dataType: 'int32', shape: [2, 1]},
     // Updates tensor shape should be [2, 4, 4].
-    updates: {dataType: 'float32', dimensions: [2, 3, 4]},
+    updates: {dataType: 'float32', shape: [2, 3, 4]},
   }
 ];
 
@@ -59,7 +59,7 @@ tests.forEach(test => promise_test(async t => {
                 if (test.output) {
                   const output = builder.scatterND(input, indices, updates);
                   assert_equals(output.dataType(), test.output.dataType);
-                  assert_array_equals(output.shape(), test.output.dimensions);
+                  assert_array_equals(output.shape(), test.output.shape);
                 } else {
                   const label = 'a_scatter_nd'
                   const options = {label};
@@ -71,32 +71,27 @@ tests.forEach(test => promise_test(async t => {
               }, test.name));
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const input =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [8]});
-  const indices =
-      builder.input('indices', {dataType: 'int32', dimensions: [4, 1]});
-  const updates =
-      builder.input('indices', {dataType: 'int32', dimensions: [4]});
+  const input = otherBuilder.input('input', {dataType: 'float32', shape: [8]});
+  const indices = builder.input('indices', {dataType: 'int32', shape: [4, 1]});
+  const updates = builder.input('indices', {dataType: 'int32', shape: [4]});
 
   assert_throws_js(TypeError, () => builder.scatterND(input, indices, updates));
 }, '[scatterND] Throw if input is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const input = builder.input('input', {dataType: 'float32', dimensions: [8]});
+  const input = builder.input('input', {dataType: 'float32', shape: [8]});
   const indices =
-      otherBuilder.input('indices', {dataType: 'int32', dimensions: [4, 1]});
-  const updates =
-      builder.input('indices', {dataType: 'int32', dimensions: [4]});
+      otherBuilder.input('indices', {dataType: 'int32', shape: [4, 1]});
+  const updates = builder.input('indices', {dataType: 'int32', shape: [4]});
 
   assert_throws_js(TypeError, () => builder.scatterND(input, indices, updates));
 }, '[scatterND] Throw if indcies is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const input = builder.input('input', {dataType: 'float32', dimensions: [8]});
-  const indices =
-      builder.input('indices', {dataType: 'int32', dimensions: [4, 1]});
+  const input = builder.input('input', {dataType: 'float32', shape: [8]});
+  const indices = builder.input('indices', {dataType: 'int32', shape: [4, 1]});
   const updates =
-      otherBuilder.input('indices', {dataType: 'int32', dimensions: [4]});
+      otherBuilder.input('indices', {dataType: 'int32', shape: [4]});
 
   assert_throws_js(TypeError, () => builder.scatterND(input, indices, updates));
 }, '[scatterND] Throw if updates is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/slice.https.any.js b/tests/wpt/tests/webnn/validation_tests/slice.https.any.js
index d2ca2c678f0..3fb3cdcd6f6 100644
--- a/tests/wpt/tests/webnn/validation_tests/slice.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/slice.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [2, 2]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [2, 2]});
 
   const starts = [1, 1];
   const sizes = [1, 1];
@@ -20,48 +20,48 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 const tests = [
   {
     name: '[slice] Test with starts=[0, 1, 2] and sizes=[1, 2, 3].',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [0, 1, 2],
     sizes: [1, 2, 3],
-    output: {dataType: 'float32', dimensions: [1, 2, 3]}
+    output: {dataType: 'float32', shape: [1, 2, 3]}
   },
   {
     name: '[slice] Throw if input is a scalar.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     starts: [0],
     sizes: [1]
   },
   {
     name:
         '[slice] Throw if the length of sizes is not equal to the rank of the input tensor.',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [1, 2, 3],
     sizes: [1, 1]
   },
   {
     name:
         '[slice] Throw if the length of starts is not equal to the rank of the input tensor.',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [1, 2, 1, 3],
     sizes: [1, 1, 1]
   },
   {
     name:
         '[slice] Throw if the starting index is equal to or greater than input size in the same dimension.',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [0, 4, 4],
     sizes: [1, 1, 1]
   },
   {
     name: '[slice] Throw if the number of elements to slice is equal to 0.',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [1, 2, 3],
     sizes: [1, 0, 1]
   },
   {
     name:
         '[slice] Throw if the ending index to slice is greater than input size in the same dimension.',
-    input: {dataType: 'float32', dimensions: [3, 4, 5]},
+    input: {dataType: 'float32', shape: [3, 4, 5]},
     starts: [0, 1, 2],
     sizes: [3, 4, 1]
   },
@@ -70,14 +70,12 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
 
       if (test.output) {
         const output = builder.slice(input, test.starts, test.sizes);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'slice_xxx';
         const options = {label};
diff --git a/tests/wpt/tests/webnn/validation_tests/softmax.https.any.js b/tests/wpt/tests/webnn/validation_tests/softmax.https.any.js
index 8c9e65f6eee..4a5ee563070 100644
--- a/tests/wpt/tests/webnn/validation_tests/softmax.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/softmax.https.any.js
@@ -8,36 +8,34 @@
 'use strict';
 
 const tests_without_axis = [
-    {
-        name: '[softmax] Test building Softmax with float32 input without axis.',
-        input: { dataType: 'float32', dimensions: [4, 3] },
-        output: { dataType: 'float32', dimensions: [4, 3] }
-    },
-    {
-        name: '[softmax] Test building Softmax with float16 input without axis.',
-        input: { dataType: 'float16', dimensions: [3, 5] },
-        output: { dataType: 'float16', dimensions: [3, 5] }
-    },
-    {
-        name: '[softmax] Throw if the input is not a non-floating point data.',
-        input: { dataType: 'int32', dimensions: [3, 2] }
-    },
-    {
-        name: '[softmax] Throw if the input dimensions is not 2.',
-        input: { dataType: 'float32', dimensions: [1, 4, 3] }
-    }
+  {
+    name: '[softmax] Test building Softmax with float32 input without axis.',
+    input: {dataType: 'float32', shape: [4, 3]},
+    output: {dataType: 'float32', shape: [4, 3]}
+  },
+  {
+    name: '[softmax] Test building Softmax with float16 input without axis.',
+    input: {dataType: 'float16', shape: [3, 5]},
+    output: {dataType: 'float16', shape: [3, 5]}
+  },
+  {
+    name: '[softmax] Throw if the input is not a non-floating point data.',
+    input: {dataType: 'int32', shape: [3, 2]}
+  },
+  {
+    name: '[softmax] Throw if the input dimensions is not 2.',
+    input: {dataType: 'float32', shape: [1, 4, 3]}
+  }
 ];
 
 tests_without_axis.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      let input = builder.input(
-          `input`,
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      let input = builder.input(`input`, test.input);
       if (test.output) {
         const output = builder.softmax(input);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {
           label: 'softmax_xxx',
@@ -54,49 +52,45 @@ tests_without_axis.forEach(
     }, test.name));
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-    const operandDescriptor = { dataType: 'float32', dimensions: [2, 3] };
-    const inputFromOtherBuilder = otherBuilder.input('input', operandDescriptor);
+  const operandDescriptor = {dataType: 'float32', shape: [2, 3]};
+  const inputFromOtherBuilder = otherBuilder.input('input', operandDescriptor);
 
-    assert_throws_js(
-        TypeError,
-        () => builder.softmax(inputFromOtherBuilder));
+  assert_throws_js(TypeError, () => builder.softmax(inputFromOtherBuilder));
 }, '[softmax without axis] throw if any input is from another builder');
 
 const tests = [
-    {
-        name: '[softmax] Test building Softmax with float32 input.',
-        input: { dataType: 'float32', dimensions: [4, 4, 3] },
-        axis: 1,
-        output: { dataType: 'float32', dimensions: [4, 4, 3] }
-    },
-    {
-        name: '[softmax] Test building Softmax with float16 input.',
-        input: { dataType: 'float16', dimensions: [3, 1, 5, 2] },
-        axis: 2,
-        output: { dataType: 'float16', dimensions: [3, 1, 5, 2] }
-    },
-    {
-        name: '[softmax] Throw if the input is not a non-floating-point data.',
-        input: { dataType: 'int32', dimensions: [3, 1, 5, 2] },
-        axis: 3
-    },
-    {
-        name: '[softmax] Throw if the axis is greater than input rank - 1.',
-        input: { dataType: 'float16', dimensions: [3, 1, 5, 2] },
-        axis: 4
-    }
+  {
+    name: '[softmax] Test building Softmax with float32 input.',
+    input: {dataType: 'float32', shape: [4, 4, 3]},
+    axis: 1,
+    output: {dataType: 'float32', shape: [4, 4, 3]}
+  },
+  {
+    name: '[softmax] Test building Softmax with float16 input.',
+    input: {dataType: 'float16', shape: [3, 1, 5, 2]},
+    axis: 2,
+    output: {dataType: 'float16', shape: [3, 1, 5, 2]}
+  },
+  {
+    name: '[softmax] Throw if the input is not a non-floating-point data.',
+    input: {dataType: 'int32', shape: [3, 1, 5, 2]},
+    axis: 3
+  },
+  {
+    name: '[softmax] Throw if the axis is greater than input rank - 1.',
+    input: {dataType: 'float16', shape: [3, 1, 5, 2]},
+    axis: 4
+  }
 ];
 
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      let input = builder.input(
-          `input`,
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      let input = builder.input(`input`, test.input);
       if (test.output) {
         const output = builder.softmax(input, test.axis);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'softmax_xxx';
         const options = {label};
@@ -107,11 +101,10 @@ tests.forEach(
     }, test.name));
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-    const operandDescriptor = { dataType: 'float32', dimensions: [1, 2, 3] };
-    const inputFromOtherBuilder = otherBuilder.input('input', operandDescriptor);
-    const axis = 1;
+  const operandDescriptor = {dataType: 'float32', shape: [1, 2, 3]};
+  const inputFromOtherBuilder = otherBuilder.input('input', operandDescriptor);
+  const axis = 1;
 
-    assert_throws_js(
-        TypeError,
-        () => builder.softmax(inputFromOtherBuilder, axis));
+  assert_throws_js(
+      TypeError, () => builder.softmax(inputFromOtherBuilder, axis));
 }, '[softmax] throw if any input is from another builder');
diff --git a/tests/wpt/tests/webnn/validation_tests/split.https.any.js b/tests/wpt/tests/webnn/validation_tests/split.https.any.js
index 31b0c449385..c25f839168d 100644
--- a/tests/wpt/tests/webnn/validation_tests/split.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/split.https.any.js
@@ -9,7 +9,7 @@
 
 multi_builder_test(async (t, builder, otherBuilder) => {
   const inputFromOtherBuilder =
-      otherBuilder.input('input', {dataType: 'float32', dimensions: [4, 4]});
+      otherBuilder.input('input', {dataType: 'float32', shape: [4, 4]});
 
   const splits = 2;
   assert_throws_js(
@@ -20,33 +20,33 @@ const label = 'xxx-split';
 const tests = [
   {
     name: '[split] Test with default options.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: [2],
     outputs: [
-      {dataType: 'float32', dimensions: [2, 6]},
+      {dataType: 'float32', shape: [2, 6]},
     ]
   },
   {
     name:
         '[split] Test with a sequence of unsigned long splits and with options.axis = 1.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: [1, 2, 3],
     options: {axis: 1},
     outputs: [
-      {dataType: 'float32', dimensions: [2, 1]},
-      {dataType: 'float32', dimensions: [2, 2]},
-      {dataType: 'float32', dimensions: [2, 3]},
+      {dataType: 'float32', shape: [2, 1]},
+      {dataType: 'float32', shape: [2, 2]},
+      {dataType: 'float32', shape: [2, 3]},
     ]
   },
   {
     name: '[split] Throw if splitting a scalar.',
-    input: {dataType: 'float32', dimensions: []},
+    input: {dataType: 'float32', shape: []},
     splits: [2],
     options: {label}
   },
   {
     name: '[split] Throw if axis is larger than input rank.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: [2],
     options: {
       axis: 2,
@@ -55,7 +55,7 @@ const tests = [
   },
   {
     name: '[split] Throw if splits is equal to 0.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: [0],
     options: {
       axis: 0,
@@ -64,7 +64,7 @@ const tests = [
   },
   {
     name: '[split] Throw if splits (scalar) is equal to 0.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: 0,
     options: {
       axis: 0,
@@ -74,7 +74,7 @@ const tests = [
   {
     name:
         '[split] Throw if the splits can not evenly divide the dimension size of input along options.axis.',
-    input: {dataType: 'float32', dimensions: [2, 5]},
+    input: {dataType: 'float32', shape: [2, 5]},
     splits: [2],
     options: {
       axis: 1,
@@ -84,7 +84,7 @@ const tests = [
   {
     name:
         '[split] Throw if splits (scalar) can not evenly divide the dimension size of input along options.axis.',
-    input: {dataType: 'float32', dimensions: [2, 5]},
+    input: {dataType: 'float32', shape: [2, 5]},
     splits: 2,
     options: {
       axis: 1,
@@ -94,7 +94,7 @@ const tests = [
   {
     name:
         '[split] Throw if the sum of splits sizes not equal to the dimension size of input along options.axis.',
-    input: {dataType: 'float32', dimensions: [2, 6]},
+    input: {dataType: 'float32', shape: [2, 6]},
     splits: [2, 2, 3],
     options: {
       axis: 1,
@@ -106,15 +106,13 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       if (test.outputs) {
         const outputs = builder.split(input, test.splits, test.options);
         assert_equals(outputs.length, test.outputs.length);
         for (let i = 0; i < outputs.length; ++i) {
           assert_equals(outputs[i].dataType(), test.outputs[i].dataType);
-          assert_array_equals(outputs[i].shape(), test.outputs[i].dimensions);
+          assert_array_equals(outputs[i].shape(), test.outputs[i].shape);
         }
       } else {
         const regrexp = new RegExp('\\[' + label + '\\]');
diff --git a/tests/wpt/tests/webnn/validation_tests/tile.https.any.js b/tests/wpt/tests/webnn/validation_tests/tile.https.any.js
index d6b24b6c389..6ad81cba4be 100644
--- a/tests/wpt/tests/webnn/validation_tests/tile.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/tile.https.any.js
@@ -14,9 +14,9 @@ const tests = [
   {
     name:
         '[tile] Test building tile with repetitions=[1, 1, 1, 1], float32 data type.',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     repetitions: [1, 1, 1, 1],
-    output: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    output: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {
       label: label,
     },
@@ -24,30 +24,30 @@ const tests = [
   {
     name:
         '[tile] Test building tile with repetitions=[1, 2, 3, 4], uint32 data type.',
-    input: {dataType: 'uint32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'uint32', shape: [1, 2, 3, 4]},
     repetitions: [1, 2, 3, 4],
-    output: {dataType: 'uint32', dimensions: [1, 4, 9, 16]},
+    output: {dataType: 'uint32', shape: [1, 4, 9, 16]},
   },
   {
     name:
         '[tile] Throw if repetitions\'s size is not the same as input\'s rank.',
-    input: {dataType: 'int32', dimensions: [1, 2, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 4]},
     repetitions: [1, 2, 3, 4],
   },
   {
     name: '[tile] Throw if any value in repetitions is zero.',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     repetitions: [0, 1, 2, 3],
   },
   {
     name: '[tile] Throw if any value in repetitions is negative.',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     repetitions: [-1, 1, 2, 3],
   },
   {
     name:
         '[tile] Throw if any value in repetitions causes tiled dimension size overflow.',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     repetitions: [1, 1, kMaxUnsignedLong, 3],
   }
 ];
@@ -55,13 +55,11 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       if (test.output) {
         const output = builder.tile(input, test.repetitions, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {...test.options};
         if (options.label) {
diff --git a/tests/wpt/tests/webnn/validation_tests/transpose.https.any.js b/tests/wpt/tests/webnn/validation_tests/transpose.https.any.js
index d6d250d7922..a79e14008a6 100644
--- a/tests/wpt/tests/webnn/validation_tests/transpose.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/transpose.https.any.js
@@ -13,14 +13,14 @@ const label = 'transpose-2';
 const tests = [
   {
     name: '[transpose] Test building transpose with permutation=[0, 2, 3, 1].',
-    input: {dataType: 'float32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'float32', shape: [1, 2, 3, 4]},
     options: {permutation: [0, 2, 3, 1]},
-    output: {dataType: 'float32', dimensions: [1, 3, 4, 2]}
+    output: {dataType: 'float32', shape: [1, 3, 4, 2]}
   },
   {
     name:
         '[transpose] Throw if permutation\'s size is not the same as input\'s rank.',
-    input: {dataType: 'int32', dimensions: [1, 2, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 4]},
     options: {
       permutation: [0, 2, 3, 1],
       label: label,
@@ -28,7 +28,7 @@ const tests = [
   },
   {
     name: '[transpose] Throw if two values in permutation are same.',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     options: {
       permutation: [0, 2, 3, 2],
       label: label,
@@ -37,7 +37,7 @@ const tests = [
   {
     name:
         '[transpose] Throw if any value in permutation is not in the range [0,input\'s rank).',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     options: {
       permutation: [0, 1, 2, 4],
       label: label,
@@ -45,7 +45,7 @@ const tests = [
   },
   {
     name: '[transpose] Throw if any value in permutation is negative.',
-    input: {dataType: 'int32', dimensions: [1, 2, 3, 4]},
+    input: {dataType: 'int32', shape: [1, 2, 3, 4]},
     options: {
       permutation: [0, -1, 2, 3],
     },
@@ -55,13 +55,11 @@ const tests = [
 tests.forEach(
     test => promise_test(async t => {
       const builder = new MLGraphBuilder(context);
-      const input = builder.input(
-          'input',
-          {dataType: test.input.dataType, dimensions: test.input.dimensions});
+      const input = builder.input('input', test.input);
       if (test.output) {
         const output = builder.transpose(input, test.options);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const options = {...test.options};
         if (options.label) {
@@ -80,8 +78,8 @@ promise_test(async t => {
       continue;
     }
     const builder = new MLGraphBuilder(context);
-    const dimensions = [1, 2, 3, 4];
-    const input = builder.input(`input`, {dataType, dimensions});
+    const shape = [1, 2, 3, 4];
+    const input = builder.input(`input`, {dataType, shape});
     if (context.opSupportLimits().transpose.input.dataTypes.includes(
             dataType)) {
       const output = builder.transpose(input);
diff --git a/tests/wpt/tests/webnn/validation_tests/triangular.https.any.js b/tests/wpt/tests/webnn/validation_tests/triangular.https.any.js
index 0995d21d692..bfeb716f9c4 100644
--- a/tests/wpt/tests/webnn/validation_tests/triangular.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/triangular.https.any.js
@@ -11,12 +11,12 @@ promise_test(async t => {
   const builder = new MLGraphBuilder(context);
 
   // The input tensor which is at least 2-D.
-  for (let dimensions of allWebNNDimensionsArray.slice(0, 2)) {
+  for (let shape of allWebNNShapesArray.slice(0, 2)) {
     for (let dataType of allWebNNOperandDataTypes) {
       if (!context.opSupportLimits().input.dataTypes.includes(dataType)) {
         continue;
       }
-      const input = builder.input(`input${++inputIndex}`, {dataType, dimensions});
+      const input = builder.input(`input${++inputIndex}`, {dataType, shape});
       const label = 'triangular_3';
       const options = {label};
       const regrexp = new RegExp('\\[' + label + '\\]');
diff --git a/tests/wpt/tests/webnn/validation_tests/where.https.any.js b/tests/wpt/tests/webnn/validation_tests/where.https.any.js
index 884b4857317..2f1941556b1 100644
--- a/tests/wpt/tests/webnn/validation_tests/where.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/where.https.any.js
@@ -9,71 +9,71 @@
 
 const kExampleConditionDescriptor = {
   dataType: 'uint8',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 const kExampleInputDescriptor = {
   dataType: 'float32',
-  dimensions: [2, 4]
+  shape: [2, 4]
 };
 
 const tests = [
   {
     name: '[where] Throw if the condition data type is not uint8.',
-    condition: {dataType: 'float32', dimensions: [2, 4]},
-    trueValue: {dataType: 'float32', dimensions: [2, 4]},
-    falseValue: {dataType: 'float32', dimensions: [2, 4]},
+    condition: {dataType: 'float32', shape: [2, 4]},
+    trueValue: {dataType: 'float32', shape: [2, 4]},
+    falseValue: {dataType: 'float32', shape: [2, 4]},
   },
   {
     name:
         '[where] Throw if the data types of trueValue and falseValue do not match',
-    condition: {dataType: 'uint8', dimensions: [2, 4]},
-    trueValue: {dataType: 'float16', dimensions: [2, 4]},
-    falseValue: {dataType: 'float32', dimensions: [2, 4]},
+    condition: {dataType: 'uint8', shape: [2, 4]},
+    trueValue: {dataType: 'float16', shape: [2, 4]},
+    falseValue: {dataType: 'float32', shape: [2, 4]},
   },
   {
     name:
         '[where] Throw if the shapes of trueValue and falseValue are not broadcastable',
-    condition: {dataType: 'uint8', dimensions: [2, 4]},
-    trueValue: {dataType: 'float32', dimensions: [2, 4]},
-    falseValue: {dataType: 'float32', dimensions: [2, 3]},
+    condition: {dataType: 'uint8', shape: [2, 4]},
+    trueValue: {dataType: 'float32', shape: [2, 4]},
+    falseValue: {dataType: 'float32', shape: [2, 3]},
   },
   {
     name: '[where] Throw if the condition shape is not broadcastable',
-    condition: {dataType: 'uint8', dimensions: [2, 4]},
-    trueValue: {dataType: 'float32', dimensions: [2, 3]},
-    falseValue: {dataType: 'float32', dimensions: [2, 1]},
+    condition: {dataType: 'uint8', shape: [2, 4]},
+    trueValue: {dataType: 'float32', shape: [2, 3]},
+    falseValue: {dataType: 'float32', shape: [2, 1]},
   },
   {
     name:
         '[where] Test building where with 2-D condition, 2-D trueValue and 2-D falseValue using broadcast',
-    condition: {dataType: 'uint8', dimensions: [2, 1]},
-    trueValue: {dataType: 'float32', dimensions: [2, 4]},
-    falseValue: {dataType: 'float32', dimensions: [2, 4]},
-    output: {dataType: 'float32', dimensions: [2, 4]},
+    condition: {dataType: 'uint8', shape: [2, 1]},
+    trueValue: {dataType: 'float32', shape: [2, 4]},
+    falseValue: {dataType: 'float32', shape: [2, 4]},
+    output: {dataType: 'float32', shape: [2, 4]},
   },
   {
     name:
         '[where] Test building where with 2-D condition, 2-D trueValue and 3-D falseValue using broadcast',
-    condition: {dataType: 'uint8', dimensions: [1, 4]},
-    trueValue: {dataType: 'float16', dimensions: [3, 4]},
-    falseValue: {dataType: 'float16', dimensions: [2, 3, 4]},
-    output: {dataType: 'float16', dimensions: [2, 3, 4]},
+    condition: {dataType: 'uint8', shape: [1, 4]},
+    trueValue: {dataType: 'float16', shape: [3, 4]},
+    falseValue: {dataType: 'float16', shape: [2, 3, 4]},
+    output: {dataType: 'float16', shape: [2, 3, 4]},
   },
   {
     name:
         '[where] Test building where with 3-D condition, 3-D trueValue and 2-D falseValue using broadcast',
-    condition: {dataType: 'uint8', dimensions: [2, 1, 4]},
-    trueValue: {dataType: 'int32', dimensions: [2, 3, 4]},
-    falseValue: {dataType: 'int32', dimensions: [1, 4]},
-    output: {dataType: 'int32', dimensions: [2, 3, 4]},
+    condition: {dataType: 'uint8', shape: [2, 1, 4]},
+    trueValue: {dataType: 'int32', shape: [2, 3, 4]},
+    falseValue: {dataType: 'int32', shape: [1, 4]},
+    output: {dataType: 'int32', shape: [2, 3, 4]},
   },
   {
     name:
         '[where] Test building where with 4-D condition, 3-D trueValue and 2-D falseValue using broadcast',
-    condition: {dataType: 'uint8', dimensions: [2, 3, 4, 5]},
-    trueValue: {dataType: 'uint32', dimensions: [3, 4, 5]},
-    falseValue: {dataType: 'uint32', dimensions: [4, 5]},
-    output: {dataType: 'uint32', dimensions: [2, 3, 4, 5]},
+    condition: {dataType: 'uint8', shape: [2, 3, 4, 5]},
+    trueValue: {dataType: 'uint32', shape: [3, 4, 5]},
+    falseValue: {dataType: 'uint32', shape: [4, 5]},
+    output: {dataType: 'uint32', shape: [2, 3, 4, 5]},
   }
 ];
 
@@ -83,26 +83,14 @@ tests.forEach(
       for (let operand of [test.condition, test.trueValue, test.falseValue]) {
         if (!context.opSupportLimits().input.dataTypes.includes(
                 operand.dataType)) {
-          assert_throws_js(TypeError, () => builder.input('input', {
-            dataType: operand.dataType,
-            dimensions: operand.dimensions
-          }));
+          assert_throws_js(TypeError, () => builder.input('input', operand));
           return;
         }
       }
 
-      const condition = builder.input('condition', {
-        dataType: test.condition.dataType,
-        dimensions: test.condition.dimensions
-      });
-      const trueValue = builder.input('trueValue', {
-        dataType: test.trueValue.dataType,
-        dimensions: test.trueValue.dimensions
-      });
-      const falseValue = builder.input('falseValue', {
-        dataType: test.falseValue.dataType,
-        dimensions: test.falseValue.dimensions
-      });
+      const condition = builder.input('condition', test.condition);
+      const trueValue = builder.input('trueValue', test.trueValue);
+      const falseValue = builder.input('falseValue', test.falseValue);
       if (test.output &&
           context.opSupportLimits().where.condition.dataTypes.includes(
               test.condition.dataType) &&
@@ -112,7 +100,7 @@ tests.forEach(
               test.falseValue.dataType)) {
         const output = builder.where(condition, trueValue, falseValue);
         assert_equals(output.dataType(), test.output.dataType);
-        assert_array_equals(output.shape(), test.output.dimensions);
+        assert_array_equals(output.shape(), test.output.shape);
       } else {
         const label = 'where_123';
         const options = {label};
diff --git a/tests/wpt/tests/webrtc-extensions/RTCRtpEncodingParameters-scaleResolutionDownTo.https.html b/tests/wpt/tests/webrtc-extensions/RTCRtpEncodingParameters-scaleResolutionDownTo.https.html
index 01205b889bb..ae334836d0e 100644
--- a/tests/wpt/tests/webrtc-extensions/RTCRtpEncodingParameters-scaleResolutionDownTo.https.html
+++ b/tests/wpt/tests/webrtc-extensions/RTCRtpEncodingParameters-scaleResolutionDownTo.https.html
@@ -237,4 +237,28 @@ promise_test(async t => {
   await sender.setParameters(params);
   await waitForFrameWithResolution(t, pc1, 15, 30);
 }, `scaleResolutionDownTo is orientation agnostic`);
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+  pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
+
+  const track = createResizableTrack(120, 60);
+  t.add_cleanup(() => track.stop());
+  const {sender} = pc1.addTransceiver(track);
+
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  // Restrict to 60x60. This results in 60x30 due to maintaining aspect ratio.
+  let params = sender.getParameters();
+  params.encodings[0].scaleResolutionDownTo = { maxWidth: 60, maxHeight: 60 };
+  await sender.setParameters(params);
+  await waitForFrameWithResolution(t, pc1, 60, 30);
+}, `scaleResolutionDownTo does not change aspect ratio`);
 </script>
diff --git a/tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html b/tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html
index 534df680839..da86f23017a 100644
--- a/tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html
+++ b/tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html
@@ -4,6 +4,7 @@
 <title>Test RTCPeerConnection.generateCertificate</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="./third_party/sdp/sdp.js"></script>
 <script>
   'use strict';
 
@@ -83,6 +84,16 @@
       })),
     'generateCertificate() with invalid algorithm dict should reject with NotSupportedError');
 
+  promise_test(t =>
+    promise_rejects_dom(t, 'NotSupportedError',
+      RTCPeerConnection.generateCertificate({
+        name: 'RSASSA-PKCS1-v1_5',
+        modulusLength: 2048,
+        publicExponent: new Uint8Array([1, 0, 1]),
+        hash: 'SHA-1'
+      })),
+    'generateCertificate with RSASSA-PKCS1-v1_5 parameters and SHA-1 signature should reject with NotSupportedError');
+
   /*
    *  4.10.1. Dictionary RTCCertificateExpiration
    *    dictionary RTCCertificateExpiration {
@@ -139,4 +150,20 @@
       }))
   }, 'generateCertificate() with invalid type for expires should reject with TypeError');
 
+  promise_test(t => {
+    return RTCPeerConnection.generateCertificate({
+      name: 'ECDSA',
+      namedCurve: 'P-256',
+    }).then(async cert => {
+      const pc = new RTCPeerConnection({certificates: [cert]});
+      pc.createDataChannel('wpt');
+      const offer = await pc.createOffer();
+      const sections = SDPUtils.splitSections(offer.sdp);
+      const dtlsParameters = SDPUtils.getDtlsParameters(sections[1], sections[0]);
+      assert_equals(dtlsParameters.fingerprints[0].algorithm, cert.getFingerprints()[0].algorithm);
+      // https://www.rfc-editor.org/rfc/rfc4572#section-5 requires uppercase hex in the SDP.
+      assert_equals(dtlsParameters.fingerprints[0].value, cert.getFingerprints()[0].value.toUpperCase());
+    })
+  }, 'generateCertificate() certificate fingerprint shows up in the SDP');
+
 </script>
diff --git a/tests/wpt/tests/webrtc-extensions/transfer-datachannel-worker.js b/tests/wpt/tests/webrtc/transfer-datachannel-worker.js
similarity index 100%
rename from tests/wpt/tests/webrtc-extensions/transfer-datachannel-worker.js
rename to tests/wpt/tests/webrtc/transfer-datachannel-worker.js
diff --git a/tests/wpt/tests/webrtc-extensions/transfer-datachannel.html b/tests/wpt/tests/webrtc/transfer-datachannel.html
similarity index 98%
rename from tests/wpt/tests/webrtc-extensions/transfer-datachannel.html
rename to tests/wpt/tests/webrtc/transfer-datachannel.html
index 9759a67a244..89fa50a3463 100644
--- a/tests/wpt/tests/webrtc-extensions/transfer-datachannel.html
+++ b/tests/wpt/tests/webrtc/transfer-datachannel.html
@@ -6,7 +6,6 @@
         <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
-        <script src="../service-workers/service-worker/resources/test-helpers.sub.js"></script>
         <script>
 async function createConnections(test, firstConnectionCallback, secondConnectionCallback)
 {