From e116a19f0bcec3e290b591352d3785fd68f7377e Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sun, 19 Apr 2020 08:19:10 +0000
Subject: [PATCH] Update web-platform-tests to revision
 9d583db6a1a16763322dce912bf057490cd7b0c7

---
 .../FileAPI/url/url-format.any.js.ini         |   10 +
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-004.html.ini} |    2 +-
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../background-repeat-round-roundup.xht.ini   |    2 -
 .../background-size-025.html.ini              |    2 -
 .../position-absolute-012.html.ini            |  253 ++++
 ...mage-orientation-background-image.html.ini |    2 +
 .../image-orientation-border-image.html.ini   |    2 +
 ...mage-orientation-list-style-image.html.ini |    2 +
 .../image-orientation-mask-image.html.ini     |    2 +
 .../white-space-intrinsic-size-013.html.ini   |    2 +
 .../transform-scale-hittest.html.ini          |    3 -
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +-
 .../properties-value-001.html.ini             |  511 ++++++++
 .../properties-value-003.html.ini             |  511 ++++++++
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../filter-turbulence-invalid-001.html.ini    |    2 +
 .../fetch/content-type/response.window.js.ini |   15 +-
 .../fetch/content-type/script.window.js.ini   |    5 +-
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini           |    4 +
 ...cation-protocol-setter-non-broken.html.ini |   15 +
 .../supported-elements.html.ini               |   12 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +
 ...zy-in-cross-origin-iframe-001.sub.html.ini |    4 +
 ...zy-in-cross-origin-iframe-002.sub.html.ini |    4 +
 ...image-loading-lazy-multiple-times.html.ini |    4 +
 .../activation-behavior.window.js.ini         |    4 +
 ...le-event-handler-settings-objects.html.ini |    5 +
 .../audiobuffersource-multi-channels.html.ini |    3 +
 .../webmessaging/with-ports/018.html.ini      |    5 +
 .../workers/WorkerGlobalScope-close.html.ini  |    4 -
 .../FileAPI/url/url-format.any.js.ini         |    1 +
 tests/wpt/metadata/MANIFEST.json              | 1034 +++++++++++------
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-004.html.ini} |    2 +-
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../background-repeat-round-roundup.xht.ini   |    2 -
 .../background-size-025.html.ini              |    2 -
 .../flexbox_margin-collapse.html.ini          |    3 -
 .../position-absolute-012.html.ini            |  253 ++++
 ...mage-orientation-background-image.html.ini |    2 +
 .../image-orientation-border-image.html.ini   |    2 +
 ...mage-orientation-list-style-image.html.ini |    2 +
 .../image-orientation-mask-image.html.ini     |    2 +
 .../white-space-intrinsic-size-013.html.ini   |    2 +
 .../transform-scale-hittest.html.ini          |    3 -
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +-
 .../properties-value-001.html.ini             |  570 ---------
 .../properties-value-003.html.ini             |   24 -
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../filter-turbulence-invalid-001.html.ini    |    2 +
 .../fetch/content-type/response.window.js.ini |   15 +-
 .../fetch/content-type/script.window.js.ini   |    5 +-
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini           |    4 +
 ...cation-protocol-setter-non-broken.html.ini |   15 +
 .../supported-elements.html.ini               |   12 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...zy-in-cross-origin-iframe-001.sub.html.ini |    3 +
 ...zy-in-cross-origin-iframe-002.sub.html.ini |    3 +
 ...image-loading-lazy-multiple-times.html.ini |    4 +
 .../activation-behavior.window.js.ini         |    4 +
 ...le-event-handler-settings-objects.html.ini |    3 -
 .../audiobuffersource-multi-channels.html.ini |    3 +
 .../webmessaging/with-ports/018.html.ini      |    5 +
 .../workers/WorkerGlobalScope-close.html.ini  |    4 -
 .../background-position-applies-to-001b.xht   |    2 +-
 .../background-position-applies-to-001c.xht   |    2 +-
 .../background-position-applies-to-001d.xht   |    2 +-
 .../background-position-applies-to-001e.xht   |    2 +-
 .../background-position-applies-to-002b.xht   |    2 +-
 .../background-position-applies-to-002c.xht   |    2 +-
 .../background-position-applies-to-002d.xht   |    2 +-
 .../background-position-applies-to-002e.xht   |    2 +-
 .../background-position-applies-to-003b.xht   |    2 +-
 .../background-position-applies-to-003c.xht   |    2 +-
 .../background-position-applies-to-003d.xht   |    2 +-
 .../background-position-applies-to-003e.xht   |    2 +-
 .../background-position-applies-to-005b.xht   |    2 +-
 .../background-position-applies-to-005c.xht   |    2 +-
 .../background-position-applies-to-005d.xht   |    2 +-
 .../background-position-applies-to-005e.xht   |    2 +-
 .../background-position-applies-to-006b.xht   |    2 +-
 .../background-position-applies-to-006c.xht   |    2 +-
 .../background-position-applies-to-006d.xht   |    2 +-
 .../background-position-applies-to-006e.xht   |    2 +-
 .../background-position-applies-to-013d.xht   |    2 +-
 .../background-position-applies-to-013e.xht   |    2 +-
 .../CSS2/backgrounds/support/60x60-red.png    |  Bin 217 -> 0 bytes
 .../css/CSS2/bidi-text/support/60x60-red.png  |  Bin 217 -> 0 bytes
 .../css/CSS2/borders/support/60x60-red.png    |  Bin 217 -> 0 bytes
 .../CSS2/box-display/support/60x60-red.png    |  Bin 217 -> 0 bytes
 .../css/CSS2/cascade/support/60x60-red.png    |  Bin 217 -> 0 bytes
 .../css/CSS2/colors/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css/CSS2/floats-clear/floats-136.xht      |    2 +-
 .../CSS2/floats-clear/support/60x60-red.png   |  Bin 217 -> 0 bytes
 .../css/CSS2/fonts/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../css/CSS2/generate/support/60x60-red.png   |  Bin 217 -> 0 bytes
 .../generated-content/support/60x60-red.png   |  Bin 217 -> 0 bytes
 .../CSS2/i18n/syndata/support/60x60-red.png   |  Bin 217 -> 0 bytes
 .../css/CSS2/lists/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../css/CSS2/pagination/support/60x60-red.png |  Bin 217 -> 0 bytes
 .../CSS2/positioning/support/60x60-red.png    |  Bin 217 -> 0 bytes
 .../css/CSS2/selectors/support/60x60-red.png  |  Bin 217 -> 0 bytes
 .../css/CSS2/support/60x60-red.png            |  Bin 217 -> 0 bytes
 .../css/CSS2/syntax/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css/CSS2/tables/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css/CSS2/text/support/60x60-red.png       |  Bin 217 -> 0 bytes
 .../css/CSS2/ui/support/60x60-red.png         |  Bin 217 -> 0 bytes
 .../css/CSS2/values/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css/CSS2/zindex/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../background-origin-007.html                |    2 +-
 .../css-backgrounds/background-size-007.html  |    2 +-
 .../css-backgrounds/background-size-010.html  |    2 +-
 ...positioned-multiple-background-images.html |    2 +-
 .../css/css-backgrounds/support/60x60-red.png |  Bin 217 -> 0 bytes
 .../css/css-contain/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css-flexbox/flex-align-items-center.html  |   53 -
 .../css-flexbox/flex-items-flexibility.html   |   57 -
 .../css-flexbox/flexbox_generated-flex.html   |    2 +-
 .../flexbox_generated-nested-flex.html        |    2 +-
 .../css/css-flexbox/flexbox_generated.html    |    2 +-
 .../flexbox_margin-auto-overflow-2-ref.html   |   33 -
 .../flexbox_margin-auto-overflow-2.html       |   33 -
 .../css-flexbox/flexbox_margin-collapse.html  |   25 -
 .../css-flexbox/flexbox_margin-left-ex.html   |    2 +-
 .../css-flexbox/position-absolute-006.html    |   22 +
 .../css-flexbox/position-absolute-007.html    |   20 +
 .../css-flexbox/position-absolute-008.html    |   22 +
 .../css-flexbox/position-absolute-009.html    |   21 +
 .../css-flexbox/position-absolute-010.html    |   21 +
 .../css-flexbox/position-absolute-011.html    |   22 +
 .../css-flexbox/position-absolute-012.html    |  117 ++
 .../flex-align-items-center-ref.html          |   67 --
 .../reference/flex-items-flexibility.html     |   37 -
 .../css/css-flexbox/support/60x60-red.png     |  Bin 217 -> 0 bytes
 .../css-flexbox/visibility-collapse-001.htm   |   39 -
 .../css-flexbox/visibility-collapse-002.htm   |   40 -
 .../css/css-fonts/support/60x60-red.png       |  Bin 217 -> 0 bytes
 .../grid-align-baseline-vertical.html         |  129 ++
 .../alignment/grid-align-baseline.html        |  109 ++
 ...container-auto-margins-scrollbars-001.html |   30 +
 ...tent-alignment-and-self-alignment-001.html |    5 +-
 ...tent-alignment-and-self-alignment-002.html |  561 +++++++++
 ...ntent-alignment-auto-sized-tracks-001.html |  167 +++
 .../grid-content-alignment-overflow-001.html  |  235 ++++
 .../grid-content-alignment-with-span-001.html |  143 +++
 ...t-alignment-with-span-vertical-lr-001.html |  143 +++
 ...t-alignment-with-span-vertical-rl-001.html |  145 +++
 ...r-margin-border-padding-scrollbar-001.html |  105 ++
 .../grid-container-scrollbars-sizing-001.html |   27 +
 .../css-grid/grid-model/grid-float-002.html   |   38 +
 .../grid-gutters-and-flex-content-001.html    |  105 ++
 .../grid-gutters-and-tracks-001.html          |  189 +++
 .../grid-model/grid-min-max-height-001.html   |   62 +
 .../grid-size-shrink-to-fit-001.html          |  101 ++
 ...flex-sizing-columns-min-max-width-001.html |    4 +-
 ...utomatic-minimum-for-auto-columns-001.html |  294 +++++
 .../grid-container-percentage-002.html        |  305 +++++
 ...ainer-auto-margins-scrollbars-001-ref.html |   21 +
 ...d-container-scrollbars-sizing-001-ref.html |   20 +
 .../image-orientation-background-image.html   |   13 +
 .../image-orientation-border-image.html       |   17 +
 .../image-orientation-list-style-image.html   |   13 +
 .../image-orientation-mask-image.html         |   19 +
 ...mage-orientation-background-image-ref.html |    9 +
 .../image-orientation-border-image-ref.html   |   13 +
 ...mage-orientation-list-style-image-ref.html |    8 +
 .../image-orientation-mask-image-ref.html     |   14 +
 .../css/css-images/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../clip-path-reference-box-004.html          |   29 +
 .../clip-path-reference-box-004-ref.html      |    2 +
 .../css/css-multicol/support/60x60-red.png    |  Bin 217 -> 0 bytes
 ...l.html => overscroll-behavior-manual.html} |    0
 .../css/css-page/support/60x60-red.png        |  Bin 217 -> 0 bytes
 .../css/css-shapes/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../css/css-style-attr/support/60x60-red.png  |  Bin 217 -> 0 bytes
 .../css/css-text/support/60x60-red.png        |  Bin 217 -> 0 bytes
 .../white-space-intrinsic-size-013.html       |   86 ++
 .../white-space-intrinsic-size-014.html       |   85 ++
 .../white-space-intrinsic-size-015.html       |   77 ++
 .../white-space-intrinsic-size-016.html       |   85 ++
 .../white-space-intrinsic-size-017.html       |   89 ++
 .../white-space-intrinsic-size-018.html       |   89 ++
 .../white-space-intrinsic-size-019.html       |   82 ++
 .../white-space-intrinsic-size-020.html       |   84 ++
 .../css/css-transforms/support/60x60-red.png  |  Bin 217 -> 0 bytes
 .../css/css-transitions/support/60x60-red.png |  Bin 217 -> 0 bytes
 .../css/css-values/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../css/cssom-view/support/60x60-red.png      |  Bin 217 -> 0 bytes
 .../css/cssom/css-style-attr-decl-block.html  |   15 +
 .../css/cssom/support/60x60-red.png           |  Bin 217 -> 0 bytes
 .../filter-turbulence-invalid-001.html        |   51 +
 .../filter-turbulence-invalid-001-ref.html    |   13 +
 .../css/filter-effects/support/60x60-red.png  |  Bin 217 -> 0 bytes
 .../docs/writing-tests/visual.md              |    2 +-
 .../event-timing/click-timing.html            |    4 +-
 .../event-timing/crossiframe.html             |    5 +-
 .../event-timing/disconnect-target.html       |   32 +
 .../event-timing/event-retarget.html          |   37 +
 .../programmatic-click-not-observed.html      |    5 +-
 .../resources/crossiframe-childframe.html     |    3 +-
 .../resources/event-timing-test-utils.js      |    4 +-
 .../event-timing/toJSON.html                  |    1 +
 .../resources/blank.html.headers              |    1 +
 ...g-lazy-in-cross-origin-iframe-001.sub.html |   59 +-
 ...g-lazy-in-cross-origin-iframe-002.sub.html |   55 +-
 ...oading-lazy-in-script-disabled-iframe.html |    2 +-
 ...lazy-move-into-script-disabled-iframe.html |    2 +-
 .../image-loading-lazy-multiple-times.html    |   55 +
 ...=> image-loading-lazy-below-viewport.html} |    4 +
 ...ml => image-loading-lazy-in-viewport.html} |    6 +
 .../scripts/cramped-001.html                  |  734 ++----------
 .../relations/css-styling/color-001.html      |   15 +-
 .../relations/css-styling/color-002.html      |   11 +-
 .../relations/css-styling/color-003.html      |   12 +-
 .../relations/css-styling/color-004.html      |   24 +-
 .../{ => motion}/free-fall-manual.https.html  |    0
 .../screen-upmost-manual.https.html           |    0
 .../screen-upright-manual.https.html          |    0
 .../{ => motion}/t025-manual.https.html       |    0
 .../{ => motion}/t028-manual.https.html       |    0
 .../deviceorientationabsoluteevent.https.html |    2 +-
 .../horizontal-surface-manual.https.html      |    0
 .../{ => orientation}/t006-manual.https.html  |    0
 .../{ => orientation}/t009-manual.https.html  |    0
 .../{ => orientation}/t010-manual.https.html  |    0
 .../{ => orientation}/t012-manual.https.html  |    0
 .../performance-timeline/idlharness.any.js    |   56 +-
 .../SVGGraphicsElement.getBBox-01.html        |    3 +
 .../tools/ci/manifest_build.py                |    3 +-
 .../tools/requirements_flake8.txt             |    2 +-
 .../wptrunner/executors/executorselenium.py   |    4 +-
 .../executors/executorservodriver.py          |    4 +-
 ...ut-of-bounds-uniform-array-access.html.ini |    7 -
 .../rendering/draw-buffers.html.ini           |   42 +
 .../rendering/rgb-format-support.html.ini     |    9 +
 243 files changed, 6909 insertions(+), 2244 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/FileAPI/url/url-format.any.js.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
 rename tests/wpt/{metadata/css/CSS2/floats/hit-test-floats-003.html.ini => metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini} (67%)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-012.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-image.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-border-image.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-mask-image.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-003.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/filter-effects/filter-turbulence-invalid-001.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 rename tests/wpt/{metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini => metadata/css/CSS2/floats/hit-test-floats-004.html.ini} (67%)
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
 delete mode 100644 tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox_margin-collapse.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-image.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-border-image.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-mask-image.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata/css/filter-effects/filter-turbulence-invalid-001.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
 create mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flex-align-items-center.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flex-items-flexibility.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-items-center-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-items-flexibility.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-001.htm
 delete mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-002.htm
 delete mode 100644 tests/wpt/web-platform-tests/css/css-fonts/support/60x60-red.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html
 rename tests/wpt/web-platform-tests/css/css-grid/{grid-definition => alignment}/grid-content-alignment-and-self-alignment-001.html (99%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-images/support/60x60-red.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-multicol/support/60x60-red.png
 rename tests/wpt/web-platform-tests/css/css-overscroll-behavior/{overscrollBehavior-manual.html => overscroll-behavior-manual.html} (100%)
 delete mode 100644 tests/wpt/web-platform-tests/css/css-page/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-shapes/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/support/60x60-red.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-transforms/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-transitions/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/css-values/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/cssom-view/support/60x60-red.png
 delete mode 100644 tests/wpt/web-platform-tests/css/cssom/support/60x60-red.png
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/filter-effects/support/60x60-red.png
 create mode 100644 tests/wpt/web-platform-tests/event-timing/disconnect-target.html
 create mode 100644 tests/wpt/web-platform-tests/event-timing/event-retarget.html
 create mode 100644 tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/{image-loading-lazy-below-viewport-iframe.html => image-loading-lazy-below-viewport.html} (89%)
 rename tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/{image-loading-lazy-in-viewport-iframe.html => image-loading-lazy-in-viewport.html} (66%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => motion}/free-fall-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => motion}/screen-upmost-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => motion}/screen-upright-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => motion}/t025-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => motion}/t028-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/deviceorientationabsoluteevent.https.html (92%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/horizontal-surface-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/t006-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/t009-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/t010-manual.https.html (100%)
 rename tests/wpt/web-platform-tests/orientation-event/{ => orientation}/t012-manual.https.html (100%)
 delete mode 100644 tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-format.any.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-format.any.js.ini
new file mode 100644
index 00000000000..01aed203a13
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-format.any.js.ini
@@ -0,0 +1,10 @@
+[url-format.any.html]
+  [Generated Blob URLs are unique]
+    expected: FAIL
+
+  [Blob URL parses correctly]
+    expected: FAIL
+
+
+[url-format.any.worker.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
similarity index 67%
rename from tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
index f29da48a2a0..4bfb0c2053a 100644
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -1,4 +1,4 @@
-[hit-test-floats-003.html]
+[hit-test-floats-004.html]
   [Miss float below something else]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
deleted file mode 100644
index f20284a5396..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-round-roundup.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini
deleted file mode 100644
index 4143512af62..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-size-025.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-012.html.ini
new file mode 100644
index 00000000000..4074c3b4906
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-012.html.ini
@@ -0,0 +1,253 @@
+[position-absolute-012.html]
+  [.flexbox 38]
+    expected: FAIL
+
+  [.flexbox 39]
+    expected: FAIL
+
+  [.flexbox 35]
+    expected: FAIL
+
+  [.flexbox 36]
+    expected: FAIL
+
+  [.flexbox 37]
+    expected: FAIL
+
+  [.flexbox 30]
+    expected: FAIL
+
+  [.flexbox 31]
+    expected: FAIL
+
+  [.flexbox 32]
+    expected: FAIL
+
+  [.flexbox 33]
+    expected: FAIL
+
+  [.flexbox 88]
+    expected: FAIL
+
+  [.flexbox 80]
+    expected: FAIL
+
+  [.flexbox 83]
+    expected: FAIL
+
+  [.flexbox 82]
+    expected: FAIL
+
+  [.flexbox 85]
+    expected: FAIL
+
+  [.flexbox 84]
+    expected: FAIL
+
+  [.flexbox 87]
+    expected: FAIL
+
+  [.flexbox 86]
+    expected: FAIL
+
+  [.flexbox 16]
+    expected: FAIL
+
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 18]
+    expected: FAIL
+
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 94]
+    expected: FAIL
+
+  [.flexbox 95]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 90]
+    expected: FAIL
+
+  [.flexbox 91]
+    expected: FAIL
+
+  [.flexbox 63]
+    expected: FAIL
+
+  [.flexbox 62]
+    expected: FAIL
+
+  [.flexbox 61]
+    expected: FAIL
+
+  [.flexbox 60]
+    expected: FAIL
+
+  [.flexbox 67]
+    expected: FAIL
+
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 64]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
+  [.flexbox 68]
+    expected: FAIL
+
+  [.flexbox 70]
+    expected: FAIL
+
+  [.flexbox 71]
+    expected: FAIL
+
+  [.flexbox 72]
+    expected: FAIL
+
+  [.flexbox 74]
+    expected: FAIL
+
+  [.flexbox 75]
+    expected: FAIL
+
+  [.flexbox 76]
+    expected: FAIL
+
+  [.flexbox 77]
+    expected: FAIL
+
+  [.flexbox 78]
+    expected: FAIL
+
+  [.flexbox 79]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 40]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 49]
+    expected: FAIL
+
+  [.flexbox 48]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 52]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 51]
+    expected: FAIL
+
+  [.flexbox 56]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 28]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 23]
+    expected: FAIL
+
+  [.flexbox 22]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 20]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-image.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-image.html.ini
new file mode 100644
index 00000000000..83c78aa752e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-border-image.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-border-image.html.ini
new file mode 100644
index 00000000000..7398701d813
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-border-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-border-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-list-style-image.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
new file mode 100644
index 00000000000..65600fe4b98
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-list-style-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-mask-image.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-mask-image.html.ini
new file mode 100644
index 00000000000..37cda176ea0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-mask-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-mask-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/white-space-intrinsic-size-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
new file mode 100644
index 00000000000..9b65faf7084
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
@@ -0,0 +1,2 @@
+[white-space-intrinsic-size-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index 70a00a101f6..e35a452a186 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
new file mode 100644
index 00000000000..7eb5ee13a31
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -0,0 +1,511 @@
+[properties-value-001.html]
+  [outline-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [background-position length(pt) / values]
+    expected: FAIL
+
+  [background-position length(pt) / events]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [line-height number(decimal) / values]
+    expected: FAIL
+
+  [word-spacing length(mm) / values]
+    expected: FAIL
+
+  [text-indent length(pc) / values]
+    expected: FAIL
+
+  [opacity number[0,1\](zero-to-one) / values]
+    expected: FAIL
+
+  [line-height number(integer) / values]
+    expected: FAIL
+
+  [outline-offset length(px) / values]
+    expected: FAIL
+
+  [font-size length(pt) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [vertical-align length(in) / values]
+    expected: FAIL
+
+  [max-height percentage(%) / values]
+    expected: FAIL
+
+  [background-position length(px) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [background-position length(cm) / events]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [font-size length(ex) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [background-position length(mm) / values]
+    expected: FAIL
+
+  [line-height length(px) / values]
+    expected: FAIL
+
+  [word-spacing length(px) / values]
+    expected: FAIL
+
+  [vertical-align percentage(%) / values]
+    expected: FAIL
+
+  [background-position length(in) / events]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [line-height length(ex) / values]
+    expected: FAIL
+
+  [color color(rgba) / values]
+    expected: FAIL
+
+  [font-size length(in) / values]
+    expected: FAIL
+
+  [text-indent length(ex) / values]
+    expected: FAIL
+
+  [font-size length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [vertical-align length(em) / values]
+    expected: FAIL
+
+  [text-indent length(px) / values]
+    expected: FAIL
+
+  [clip rectangle(rectangle) / values]
+    expected: FAIL
+
+  [word-spacing length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [max-width length(em) / values]
+    expected: FAIL
+
+  [background-position length(em) / events]
+    expected: FAIL
+
+  [font-size length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [outline-offset length(ex) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [vertical-align length(pc) / values]
+    expected: FAIL
+
+  [vertical-align length(cm) / values]
+    expected: FAIL
+
+  [max-height length(ex) / values]
+    expected: FAIL
+
+  [vertical-align length(ex) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [outline-offset length(mm) / values]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / values]
+    expected: FAIL
+
+  [max-height length(mm) / values]
+    expected: FAIL
+
+  [outline-offset length(pt) / values]
+    expected: FAIL
+
+  [line-height length(mm) / values]
+    expected: FAIL
+
+  [line-height length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [letter-spacing length(in) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [letter-spacing length(mm) / values]
+    expected: FAIL
+
+  [font-size percentage(%) / values]
+    expected: FAIL
+
+  [letter-spacing length(cm) / values]
+    expected: FAIL
+
+  [vertical-align length(pt) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [letter-spacing length(pc) / values]
+    expected: FAIL
+
+  [letter-spacing length(pt) / values]
+    expected: FAIL
+
+  [word-spacing length(ex) / values]
+    expected: FAIL
+
+  [line-height length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [max-width length(mm) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [background-position length(ex) / values]
+    expected: FAIL
+
+  [max-width length(px) / values]
+    expected: FAIL
+
+  [text-indent length(mm) / values]
+    expected: FAIL
+
+  [font-size length(mm) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [letter-spacing length(em) / values]
+    expected: FAIL
+
+  [background-position length(cm) / values]
+    expected: FAIL
+
+  [line-height length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [word-spacing length(pc) / values]
+    expected: FAIL
+
+  [outline-offset length(in) / values]
+    expected: FAIL
+
+  [word-spacing length(in) / values]
+    expected: FAIL
+
+  [outline-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [font-size length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [outline-width length(in) / values]
+    expected: FAIL
+
+  [word-spacing length(pt) / values]
+    expected: FAIL
+
+  [text-indent length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [max-width length(in) / values]
+    expected: FAIL
+
+  [outline-color color(rgba) / values]
+    expected: FAIL
+
+  [background-position length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / values]
+    expected: FAIL
+
+  [background-position length(pc) / events]
+    expected: FAIL
+
+  [max-height length(in) / values]
+    expected: FAIL
+
+  [line-height length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [outline-width length(ex) / values]
+    expected: FAIL
+
+  [font-size length(pc) / values]
+    expected: FAIL
+
+  [background-position length(in) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [outline-width length(cm) / values]
+    expected: FAIL
+
+  [max-width percentage(%) / values]
+    expected: FAIL
+
+  [max-width length(ex) / values]
+    expected: FAIL
+
+  [letter-spacing length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [outline-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [outline-width length(pc) / values]
+    expected: FAIL
+
+  [word-spacing percentage(%) / values]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / values]
+    expected: FAIL
+
+  [vertical-align length(px) / values]
+    expected: FAIL
+
+  [letter-spacing length(px) / values]
+    expected: FAIL
+
+  [max-width length(pt) / values]
+    expected: FAIL
+
+  [line-height percentage(%) / values]
+    expected: FAIL
+
+  [text-indent length(in) / values]
+    expected: FAIL
+
+  [text-indent length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [background-position length(pc) / values]
+    expected: FAIL
+
+  [background-position percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(cm) / values]
+    expected: FAIL
+
+  [outline-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [max-width length(cm) / values]
+    expected: FAIL
+
+  [outline-offset length(em) / values]
+    expected: FAIL
+
+  [outline-offset length(cm) / values]
+    expected: FAIL
+
+  [background-position length(mm) / events]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [z-index integer(integer) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [vertical-align length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [text-indent percentage(%) / values]
+    expected: FAIL
+
+  [line-height length(pc) / values]
+    expected: FAIL
+
+  [background-position length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [outline-offset length(pc) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [word-spacing length(cm) / values]
+    expected: FAIL
+
+  [background-position percentage(%) / events]
+    expected: FAIL
+
+  [max-width length(pc) / values]
+    expected: FAIL
+
+  [background-position length(px) / events]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-003.html.ini
new file mode 100644
index 00000000000..aba0b668a6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-003.html.ini
@@ -0,0 +1,511 @@
+[properties-value-003.html]
+  [outline-radius-bottomleft length(em) / events]
+    expected: FAIL
+
+  [column-rule-width length(pc) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(pc) / values]
+    expected: FAIL
+
+  [column-rule-width length(ex) / values]
+    expected: FAIL
+
+  [marker-offset length(in) / values]
+    expected: FAIL
+
+  [marker-offset length(pc) / values]
+    expected: FAIL
+
+  [column-rule-width length(cm) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(cm) / events]
+    expected: FAIL
+
+  [marker-offset length(cm) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright percentage(%) / values]
+    expected: FAIL
+
+  [column-rule-width length(cm) / values]
+    expected: FAIL
+
+  [background-size background-size(keyword) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(in) / events]
+    expected: FAIL
+
+  [font-size-adjust number(decimal) / values]
+    expected: FAIL
+
+  [marker-offset length(mm) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(pt) / values]
+    expected: FAIL
+
+  [marker-offset length(pc) / events]
+    expected: FAIL
+
+  [column-gap length(pt) / values]
+    expected: FAIL
+
+  [column-gap length(mm) / values]
+    expected: FAIL
+
+  [column-gap length(mm) / events]
+    expected: FAIL
+
+  [column-gap length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(cm) / values]
+    expected: FAIL
+
+  [column-gap length(px) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(px) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(px) / events]
+    expected: FAIL
+
+  [column-rule-width length(in) / events]
+    expected: FAIL
+
+  [column-width length(in) / values]
+    expected: FAIL
+
+  [column-gap length(pc) / values]
+    expected: FAIL
+
+  [column-gap length(cm) / events]
+    expected: FAIL
+
+  [column-gap length(ex) / events]
+    expected: FAIL
+
+  [column-rule-width length(em) / events]
+    expected: FAIL
+
+  [column-rule-width length(pt) / events]
+    expected: FAIL
+
+  [column-width length(pc) / events]
+    expected: FAIL
+
+  [background-image image(data) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(cm) / values]
+    expected: FAIL
+
+  [column-width length(cm) / values]
+    expected: FAIL
+
+  [display display(static to absolute) / events]
+    expected: FAIL
+
+  [zoom number(integer) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(pt) / values]
+    expected: FAIL
+
+  [outline-radius-topright percentage(%) / values]
+    expected: FAIL
+
+  [outline-radius-topleft percentage(%) / values]
+    expected: FAIL
+
+  [marker-offset length(cm) / events]
+    expected: FAIL
+
+  [transform transform(rotate) / values]
+    expected: FAIL
+
+  [column-rule-width length(px) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(ex) / events]
+    expected: FAIL
+
+  [column-count integer(integer) / values]
+    expected: FAIL
+
+  [marker-offset length(em) / values]
+    expected: FAIL
+
+  [column-width length(px) / values]
+    expected: FAIL
+
+  [font-size-adjust number(integer) / values]
+    expected: FAIL
+
+  [column-width length(in) / events]
+    expected: FAIL
+
+  [column-rule-width length(pt) / values]
+    expected: FAIL
+
+  [column-rule-width length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(px) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(pc) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(pt) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(pc) / events]
+    expected: FAIL
+
+  [border-bottom-right-radius border-radius(px-px) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(pt) / events]
+    expected: FAIL
+
+  [column-rule-color color(rgba) / values]
+    expected: FAIL
+
+  [background-image image(gradient) / values]
+    expected: FAIL
+
+  [column-width length(pt) / events]
+    expected: FAIL
+
+  [column-count integer(integer) / events]
+    expected: FAIL
+
+  [marker-offset length(pt) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft percentage(%) / events]
+    expected: FAIL
+
+  [marker-offset length(ex) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(ex) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(em) / events]
+    expected: FAIL
+
+  [column-gap length(cm) / values]
+    expected: FAIL
+
+  [text-decoration-color color(rgba) / events]
+    expected: FAIL
+
+  [column-width length(cm) / events]
+    expected: FAIL
+
+  [column-rule-width length(mm) / values]
+    expected: FAIL
+
+  [column-gap length(px) / values]
+    expected: FAIL
+
+  [column-rule-width length(mm) / events]
+    expected: FAIL
+
+  [outline-radius-topright length(ex) / events]
+    expected: FAIL
+
+  [column-width length(px) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(cm) / events]
+    expected: FAIL
+
+  [position position(static to absolute) / events]
+    expected: FAIL
+
+  [column-rule-width length(in) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(px) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(in) / events]
+    expected: FAIL
+
+  [column-rule-color color(rgba) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(in) / values]
+    expected: FAIL
+
+  [column-width length(mm) / values]
+    expected: FAIL
+
+  [text-decoration-color color(rgba) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(pc) / events]
+    expected: FAIL
+
+  [column-rule-width length(pc) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(mm) / values]
+    expected: FAIL
+
+  [font-stretch font-stretch(keyword) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(mm) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(mm) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(pt) / events]
+    expected: FAIL
+
+  [column-gap length(in) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(ex) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(in) / values]
+    expected: FAIL
+
+  [transform-origin horizontal(keyword) / values]
+    expected: FAIL
+
+  [outline-radius-topleft percentage(%) / events]
+    expected: FAIL
+
+  [display display(static to absolute) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(px) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(px) / values]
+    expected: FAIL
+
+  [border-top-right-radius border-radius(px) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(em) / events]
+    expected: FAIL
+
+  [outline-radius-topright length(mm) / values]
+    expected: FAIL
+
+  [border-top-left-radius border-radius(px-px) / values]
+    expected: FAIL
+
+  [column-width length(ex) / values]
+    expected: FAIL
+
+  [column-gap length(ex) / values]
+    expected: FAIL
+
+  [font-size-adjust number(integer) / events]
+    expected: FAIL
+
+  [marker-offset length(em) / events]
+    expected: FAIL
+
+  [column-width length(pc) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(pt) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(in) / values]
+    expected: FAIL
+
+  [column-gap length(in) / events]
+    expected: FAIL
+
+  [marker-offset length(mm) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(pc) / values]
+    expected: FAIL
+
+  [column-width length(em) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(mm) / events]
+    expected: FAIL
+
+  [marker-offset length(ex) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(in) / events]
+    expected: FAIL
+
+  [border-bottom-right-radius border-radius(px) / values]
+    expected: FAIL
+
+  [column-width length(ex) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(em) / events]
+    expected: FAIL
+
+  [border-bottom-left-radius border-radius(px-px) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(mm) / events]
+    expected: FAIL
+
+  [column-gap length(em) / events]
+    expected: FAIL
+
+  [background-image image(url) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(cm) / events]
+    expected: FAIL
+
+  [outline-radius-bottomright length(ex) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(pt) / values]
+    expected: FAIL
+
+  [marker-offset length(px) / events]
+    expected: FAIL
+
+  [marker-offset length(in) / events]
+    expected: FAIL
+
+  [column-rule-width length(ex) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(pc) / values]
+    expected: FAIL
+
+  [font-size-adjust number(decimal) / events]
+    expected: FAIL
+
+  [column-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-left-radius border-radius(px) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(cm) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft percentage(%) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(ex) / events]
+    expected: FAIL
+
+  [column-gap length(pc) / events]
+    expected: FAIL
+
+  [column-gap length(pt) / events]
+    expected: FAIL
+
+  [outline-radius-topright percentage(%) / events]
+    expected: FAIL
+
+  [outline-radius-topright length(px) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(ex) / values]
+    expected: FAIL
+
+  [position position(relative to absolute) / events]
+    expected: FAIL
+
+  [border-bottom-left-radius border-radius(px) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(em) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(mm) / events]
+    expected: FAIL
+
+  [column-rule-width length(px) / values]
+    expected: FAIL
+
+  [zoom number(decimal) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright percentage(%) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(ex) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(mm) / values]
+    expected: FAIL
+
+  [outline-radius-topright length(px) / values]
+    expected: FAIL
+
+  [marker-offset length(px) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(pc) / values]
+    expected: FAIL
+
+  [marker-offset length(pt) / values]
+    expected: FAIL
+
+  [outline-radius-topleft length(pc) / events]
+    expected: FAIL
+
+  [zoom number(integer) / values]
+    expected: FAIL
+
+  [outline-radius-bottomright length(in) / events]
+    expected: FAIL
+
+  [box-shadow box-shadow(shadow) / values]
+    expected: FAIL
+
+  [border-top-right-radius border-radius(px-px) / values]
+    expected: FAIL
+
+  [column-width length(mm) / events]
+    expected: FAIL
+
+  [zoom number(decimal) / events]
+    expected: FAIL
+
+  [outline-radius-topleft length(pt) / events]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(cm) / values]
+    expected: FAIL
+
+  [outline-radius-bottomleft length(cm) / events]
+    expected: FAIL
+
+  [outline-radius-topright length(in) / values]
+    expected: FAIL
+
+  [column-width length(em) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/filter-effects/filter-turbulence-invalid-001.html.ini b/tests/wpt/metadata-layout-2020/css/filter-effects/filter-turbulence-invalid-001.html.ini
new file mode 100644
index 00000000000..0ec7afa5e66
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/filter-effects/filter-turbulence-invalid-001.html.ini
@@ -0,0 +1,2 @@
+[filter-turbulence-invalid-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index d1bbeb58882..b74aa631cf0 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,12 +312,6 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
@@ -327,12 +321,15 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 2d5faa72ac7..b2ffc8abf78 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,6 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 0acf56595c9..8140ed890b2 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -11,3 +11,18 @@
   [Set HTTP URL frame location.protocol to ftp]
     expected: FAIL
 
+  [Set data URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to file]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to http+x]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to ftp]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index af14e19a466..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,20 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
new file mode 100644
index 00000000000..2769c8aadf1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -0,0 +1,2 @@
+[iframe_sandbox_popups_escaping-1.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
new file mode 100644
index 00000000000..a5346c77101
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -0,0 +1,2 @@
+[iframe_sandbox_popups_escaping-2.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
new file mode 100644
index 00000000000..a40f65452df
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
@@ -0,0 +1,4 @@
+[image-loading-lazy-in-cross-origin-iframe-001.sub.html]
+  [A below-viewport loading=lazy image in a cross origin iframe loads only\n       when scrolled into viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
new file mode 100644
index 00000000000..5ca4e2a54bd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
@@ -0,0 +1,4 @@
+[image-loading-lazy-in-cross-origin-iframe-002.sub.html]
+  [A loading=lazy image in a below-viewport cross-origin iframe loads only\n       when the cross-origin iframe is scrolled into view]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
new file mode 100644
index 00000000000..7e0b1b52d2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
@@ -0,0 +1,4 @@
+[image-loading-lazy-multiple-times.html]
+  [Images with loading='lazy' can be lazy loaded multiple times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
new file mode 100644
index 00000000000..dbec6f2c2ff
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -0,0 +1,5 @@
+[compile-event-handler-settings-objects.html]
+  expected: TIMEOUT
+  [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 2a3c2ce7c0a..2d30e1fe118 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -86,3 +86,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44047 more errors.\n\tMax AbsError of 1.9999794363975525e+0 at index of 37272.\n\t[37272\]\t9.9997943639755249e-1\t-1.0000000000000000e+0\t1.9999794363975525e+0\t1.9999794363975525e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 40518 more errors.\n\tMax AbsError of 1.9880115985870361e+0 at index of 23190.\n\t[23190\]\t9.9948620796203613e-1\t-9.8852539062500000e-1\t1.9880115985870361e+0\t2.0110880483607065e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index fe8654e447c..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
index d7305ce3f96..f0ff6d1ef23 100644
--- a/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
@@ -1,4 +1,5 @@
 [url-format.any.worker.html]
+  expected: CRASH
   [Generated Blob URLs are unique]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index aa4827c60e6..312c55e5a1e 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -10142,7 +10142,7 @@
      ]
     },
     "css-overscroll-behavior": {
-     "overscrollBehavior-manual.html": [
+     "overscroll-behavior-manual.html": [
       "97f52984a51ae4157ec8ed91ddf4b3b8d405bec6",
       [
        null,
@@ -17093,94 +17093,94 @@
     }
    },
    "orientation-event": {
-    "free-fall-manual.https.html": [
-     "c71f61fa696050da421e7c3311716bf63b978c71",
-     [
-      null,
-      {}
-     ]
-    ],
-    "horizontal-surface-manual.https.html": [
-     "0b7302e704018f2b412c0565b7f134bb08c0b9df",
-     [
-      null,
-      {}
-     ]
-    ],
     "motion": {
+     "free-fall-manual.https.html": [
+      "c71f61fa696050da421e7c3311716bf63b978c71",
+      [
+       null,
+       {}
+      ]
+     ],
      "page-visibility-manual.https.html": [
       "37e48ce9791eb952c7375ee0e6cbd71727e54aa7",
       [
        null,
        {}
       ]
+     ],
+     "screen-upmost-manual.https.html": [
+      "560c3e3a1f6bde251197585843263dcd1fc8ed6d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "screen-upright-manual.https.html": [
+      "8a1b6d27da83cab9c734f78bff11985127a5e48c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "t025-manual.https.html": [
+      "9489855fcddfc8dcfb0deb2aa032f38c87a62ce4",
+      [
+       null,
+       {}
+      ]
+     ],
+     "t028-manual.https.html": [
+      "669c4e47e0f18ff6a008cc60a1cef022fbc57a1a",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "orientation": {
+     "horizontal-surface-manual.https.html": [
+      "0b7302e704018f2b412c0565b7f134bb08c0b9df",
+      [
+       null,
+       {}
+      ]
+     ],
      "page-visibility-manual.https.html": [
       "033f17602b88343313afbd1958805a628a7b3112",
       [
        null,
        {}
       ]
+     ],
+     "t006-manual.https.html": [
+      "e41f4634e8bc3d26b9a69d86b6794b922cd5df53",
+      [
+       null,
+       {}
+      ]
+     ],
+     "t009-manual.https.html": [
+      "d00f7e71b01a9486f138f01dcb0b3cb635a60906",
+      [
+       null,
+       {}
+      ]
+     ],
+     "t010-manual.https.html": [
+      "9a6e00e1f739c9d6d045e20730472602cb015852",
+      [
+       null,
+       {}
+      ]
+     ],
+     "t012-manual.https.html": [
+      "e5ac1c98b476840b286bc219cc01f6e6dbd81f2b",
+      [
+       null,
+       {}
+      ]
      ]
-    },
-    "screen-upmost-manual.https.html": [
-     "560c3e3a1f6bde251197585843263dcd1fc8ed6d",
-     [
-      null,
-      {}
-     ]
-    ],
-    "screen-upright-manual.https.html": [
-     "8a1b6d27da83cab9c734f78bff11985127a5e48c",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t006-manual.https.html": [
-     "e41f4634e8bc3d26b9a69d86b6794b922cd5df53",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t009-manual.https.html": [
-     "d00f7e71b01a9486f138f01dcb0b3cb635a60906",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t010-manual.https.html": [
-     "9a6e00e1f739c9d6d045e20730472602cb015852",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t012-manual.https.html": [
-     "e5ac1c98b476840b286bc219cc01f6e6dbd81f2b",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t025-manual.https.html": [
-     "9489855fcddfc8dcfb0deb2aa032f38c87a62ce4",
-     [
-      null,
-      {}
-     ]
-    ],
-    "t028-manual.https.html": [
-     "669c4e47e0f18ff6a008cc60a1cef022fbc57a1a",
-     [
-      null,
-      {}
-     ]
-    ]
+    }
    },
    "page-visibility": {
     "test_minimize-manual.html": [
@@ -30136,7 +30136,7 @@
        ]
       ],
       "background-position-applies-to-001b.xht": [
-       "77d0ab69dee7476cdd4d336cf2afc39dbfc66f08",
+       "e7c0859ede4263a5a97e80d5786572fcde2590ca",
        [
         null,
         [
@@ -30149,7 +30149,7 @@
        ]
       ],
       "background-position-applies-to-001c.xht": [
-       "f64d6c3eb73b752c4ff703e7492879613f08a507",
+       "50e5cc9040af39f08cf0623a4730ffdc690b7884",
        [
         null,
         [
@@ -30162,7 +30162,7 @@
        ]
       ],
       "background-position-applies-to-001d.xht": [
-       "816c8f38bb97991762199eb20e766d44adabe48e",
+       "46788a0726d21ea772ff589d769aef0c38d73dd4",
        [
         null,
         [
@@ -30175,7 +30175,7 @@
        ]
       ],
       "background-position-applies-to-001e.xht": [
-       "78fe69a43a90c73983a78589436ada8f2a23abe1",
+       "87c15b14080f4a53bc9b10e79ca04b2428871456",
        [
         null,
         [
@@ -30214,7 +30214,7 @@
        ]
       ],
       "background-position-applies-to-002b.xht": [
-       "af0edca4857deba7d1116f33c4367b360d14395c",
+       "56b61df91f6a889fffcefdf124c343a153b0ea22",
        [
         null,
         [
@@ -30227,7 +30227,7 @@
        ]
       ],
       "background-position-applies-to-002c.xht": [
-       "1092a7329a97f0f9c9ab676b39d571041e1f7d1f",
+       "9b16866f68230c09b905691eaddccb248d4ca704",
        [
         null,
         [
@@ -30240,7 +30240,7 @@
        ]
       ],
       "background-position-applies-to-002d.xht": [
-       "2c68171a07d9617a8d6862b60e0d19787c3afc6d",
+       "e20d44894b6ddf119b818131c24f8e610613ee82",
        [
         null,
         [
@@ -30253,7 +30253,7 @@
        ]
       ],
       "background-position-applies-to-002e.xht": [
-       "361253cea47f908319f27192824d5332de12afb8",
+       "1cc1609ec98a64262eb00862502c6f0b694cef9d",
        [
         null,
         [
@@ -30279,7 +30279,7 @@
        ]
       ],
       "background-position-applies-to-003b.xht": [
-       "21c4bad9760001a38b5fd94feb0f8d1b3895df09",
+       "0f12bae1b75c8c00ded193e4c75d85dc297143c7",
        [
         null,
         [
@@ -30292,7 +30292,7 @@
        ]
       ],
       "background-position-applies-to-003c.xht": [
-       "daac448efa8f974ad9593d4dcc53f801482c8733",
+       "7728652b5bc91af150406a9716da78a9e6016806",
        [
         null,
         [
@@ -30305,7 +30305,7 @@
        ]
       ],
       "background-position-applies-to-003d.xht": [
-       "4c89a652b4d0518f975dd5465b00b44ef30977ba",
+       "40ac5243f7d5649d40d2e9e1e9669951a50f85b9",
        [
         null,
         [
@@ -30318,7 +30318,7 @@
        ]
       ],
       "background-position-applies-to-003e.xht": [
-       "af804e7302fdc402d908583326976f824c835913",
+       "896e887ee6d9959bae5e7f5d6e43c75dfe3660f5",
        [
         null,
         [
@@ -30370,7 +30370,7 @@
        ]
       ],
       "background-position-applies-to-005b.xht": [
-       "c2921ed859977eec39efa5c07f05720441257cdb",
+       "6ab399b755e32f54673b882a58d799cac74ee6df",
        [
         null,
         [
@@ -30383,7 +30383,7 @@
        ]
       ],
       "background-position-applies-to-005c.xht": [
-       "cf625e83c62ae651a80cc3a60d4c75b922da2292",
+       "913785bb19094e691f715b3a939c28d9a301bed7",
        [
         null,
         [
@@ -30396,7 +30396,7 @@
        ]
       ],
       "background-position-applies-to-005d.xht": [
-       "0ff3849313c3d4350289b32bba007fdfcf2381fc",
+       "e5bdd45807425a4095d0ef558ecf7f014c7e3fbd",
        [
         null,
         [
@@ -30409,7 +30409,7 @@
        ]
       ],
       "background-position-applies-to-005e.xht": [
-       "43e4d55be5108949b551c24773d56ab9c46f06c6",
+       "792b77c7a51adaa55a57f17f74e197d7d7e59627",
        [
         null,
         [
@@ -30448,7 +30448,7 @@
        ]
       ],
       "background-position-applies-to-006b.xht": [
-       "ea4f76b0e2bb31e7e5f56ebbb78cb3b40bded7d5",
+       "25b8e7a2789c15df425b6f1ebb28ba215f15af0e",
        [
         null,
         [
@@ -30461,7 +30461,7 @@
        ]
       ],
       "background-position-applies-to-006c.xht": [
-       "38ca037ef6052a59449f469e61a18a816c1b63f0",
+       "ac6ff54a09e2d92b788ec710d151df1c058120d9",
        [
         null,
         [
@@ -30474,7 +30474,7 @@
        ]
       ],
       "background-position-applies-to-006d.xht": [
-       "fa83b06bbaa68e947d951fc2c29c782d88f5fa67",
+       "293a596964c16aecf46889e8d4e4509de82d7022",
        [
         null,
         [
@@ -30487,7 +30487,7 @@
        ]
       ],
       "background-position-applies-to-006e.xht": [
-       "db6436e3aade21f0f6411ec190b6be5328fef85e",
+       "328e43d3da388a6811bc3dbe731743e4e49fd5ec",
        [
         null,
         [
@@ -30552,7 +30552,7 @@
        ]
       ],
       "background-position-applies-to-013d.xht": [
-       "768f3da7e43b054184903eba4b8d071e843dffb0",
+       "4fa7e0642a184523fb467c48bfcf948d1e1b2e47",
        [
         null,
         [
@@ -30565,7 +30565,7 @@
        ]
       ],
       "background-position-applies-to-013e.xht": [
-       "44cb5257acbf36dce15c0caeac0d1f68d684ef42",
+       "fd1e6c4c493b47a0811a8c1ea613e4b6189d871c",
        [
         null,
         [
@@ -55853,7 +55853,7 @@
        ]
       ],
       "floats-136.xht": [
-       "229a9a2e10cb96d892725cec4284f34c40658fb7",
+       "207426af57c6c72db0a2f004fea5369587c1eb32",
        [
         null,
         [
@@ -118416,7 +118416,7 @@
       ]
      ],
      "background-origin-007.html": [
-      "3b7d4642f776d4d5e686c2c24213f143dd3d4c12",
+      "8652495f5736d5250041fdfe9037cd402b43c161",
       [
        null,
        [
@@ -121451,7 +121451,7 @@
       ]
      ],
      "background-size-007.html": [
-      "7efbe187118617a0873794a4d26d86317fce729c",
+      "e6b278de0e5d9b9edc082ae76d1c957f4f6bfc82",
       [
        null,
        [
@@ -121490,7 +121490,7 @@
       ]
      ],
      "background-size-010.html": [
-      "c9ac0d82f68ba2a519de0bb8260e43de4a193287",
+      "578fcdc79a6379b0a1979bee20e57c844fb0489a",
       [
        null,
        [
@@ -122920,7 +122920,7 @@
       ]
      ],
      "scroll-positioned-multiple-background-images.html": [
-      "ff8e50b9cc49068698d7ca73489005c2cae1bf16",
+      "a9ca550ce3dea2626de05bf31437a0a19aeedbce",
       [
        null,
        [
@@ -132144,19 +132144,6 @@
        {}
       ]
      ],
-     "flex-align-items-center.html": [
-      "2e239e83c143718413b7b9ad29dd0baf8e6b7c98",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/reference/flex-align-items-center-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flex-aspect-ratio-img-column-001.html": [
       "ad84dc23fe7e92a75a9ad1c9e75dcea35f231d8c",
       [
@@ -132885,19 +132872,6 @@
        {}
       ]
      ],
-     "flex-items-flexibility.html": [
-      "0f7cbe725284cef1dcfcaab6992c5971958c1f31",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/reference/flex-items-flexibility.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flex-lines": {
       "multi-line-wrap-reverse-column-reverse.html": [
        "e24c92e37f7d95936b3eb7bad392289174a46b32",
@@ -135592,7 +135566,7 @@
       ]
      ],
      "flexbox_generated-flex.html": [
-      "bfb4c9255e5b1125742f5c5666726147143359a5",
+      "b2bb8a3ede7e0a163f74de0a2e316eaf7848420e",
       [
        null,
        [
@@ -135605,7 +135579,7 @@
       ]
      ],
      "flexbox_generated-nested-flex.html": [
-      "bb7d35a94a2600ab5f2a9f73918ea3bf6eeb1e45",
+      "2a095c16e44530e96ed893edd14aa2c5e600319a",
       [
        null,
        [
@@ -135618,7 +135592,7 @@
       ]
      ],
      "flexbox_generated.html": [
-      "892e26e5c2e5a88c12995383bd66b45769e15b60",
+      "1c84d8803ec3e16f77e426a46869efa1700baf72",
       [
        null,
        [
@@ -135864,19 +135838,6 @@
        {}
       ]
      ],
-     "flexbox_margin-auto-overflow-2.html": [
-      "1b53848ac8278eca3d833214ab45ad85c94fd96f",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox_margin-auto-overflow-2-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flexbox_margin-auto-overflow.html": [
       "8d7860f8866a14861a736119c3169d3b6d2d53f5",
       [
@@ -135903,21 +135864,8 @@
        {}
       ]
      ],
-     "flexbox_margin-collapse.html": [
-      "5fbe577bbc5b7db75a728e0eed9b15b0370adb59",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox_margin-collapse-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flexbox_margin-left-ex.html": [
-      "7b12807ea8d2526a3d2ba022c75b5110f4be9fa6",
+      "ea57ef28013b8dcfec9be7db8a85d122519859a9",
       [
        null,
        [
@@ -137270,6 +137218,84 @@
        {}
       ]
      ],
+     "position-absolute-006.html": [
+      "011daa6695cd31418ac4ada1d975a65586c29523",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-007.html": [
+      "2bf8d637d2c80fd2e0208916e28bec2faa1f6e27",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-008.html": [
+      "822e8b3339784193fbb120e3b4addf0292946988",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-009.html": [
+      "c5e69e091496f2944be7e7f437cdf12b440f7af3",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-010.html": [
+      "64c228e3487a98e294e1b6de114e994ba234d2c7",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-011.html": [
+      "d4cc862c3010d66659e8727d9388ef8d641622bd",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "position-fixed-001.html": [
       "a3de19d6d9df95a505c547e48dea3de82af44de5",
       [
@@ -140551,6 +140577,19 @@
         {}
        ]
       ],
+      "grid-container-auto-margins-scrollbars-001.html": [
+       "51c7b18e949f647adb8805ddff6ee5dff110935b",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-content-distribution-001.html": [
        "7b53a2897b83d20ff7cd12db85f576830953b56e",
        [
@@ -143746,6 +143785,19 @@
         {}
        ]
       ],
+      "grid-container-scrollbars-sizing-001.html": [
+       "43b62a9316be8139cefa3f95fa6070907c8e24de",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-display-grid-001.html": [
        "3599aa960416f07ed63734b8ff959d997f74d1b9",
        [
@@ -145201,6 +145253,35 @@
       ]
      ],
      "image-orientation": {
+      "image-orientation-background-image.html": [
+       "2687a5c64b51c5e96375307f52297540c2dffebf",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             2,
+             2
+            ],
+            [
+             40,
+             40
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "image-orientation-background-properties.html": [
        "45651286b176df4a93e3237425458c07fabfdda9",
        [
@@ -145230,6 +145311,19 @@
         }
        ]
       ],
+      "image-orientation-border-image.html": [
+       "85b363ecc2fd7b2dd1abf21b75960f3b3ebad2e5",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "image-orientation-default.html": [
        "8a16ff7af49cfdf64b365013c9700266991b46c0",
        [
@@ -145491,6 +145585,64 @@
         }
        ]
       ],
+      "image-orientation-list-style-image.html": [
+       "33730a323ada45d763a37a9dc4e0a20c13a642c6",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             2,
+             2
+            ],
+            [
+             40,
+             40
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "image-orientation-mask-image.html": [
+       "dc9e5107b8eee82a6c446f9d6c173dbba5974311",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             1,
+             1
+            ],
+            [
+             22,
+             22
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "image-orientation-none-content-images.html": [
        "da5b6704143b9bec7e110beaed26b90ded1f43df",
        [
@@ -149507,6 +149659,19 @@
         {}
        ]
       ],
+      "clip-path-reference-box-004.html": [
+       "eb89065364bbb23afc73278c29fe38c1343cdfd0",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-reference-restore.html": [
        "eccebd8fbcc3a556a13829be3e25c4efead3aafc",
        [
@@ -174286,6 +174451,110 @@
         {}
        ]
       ],
+      "white-space-intrinsic-size-013.html": [
+       "298cbf7b312cc131884b921f1dbb0f48d85411b0",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-014.html": [
+       "b19c6eb27cf99f54344b91c92896d18af4a2a646",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-015.html": [
+       "d60120cc180a87bfacbd70d4a604fc67ce88c724",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-016.html": [
+       "b9a552ebff1d05616542283d0a2e2d09b3d78a04",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-017.html": [
+       "103cb077226b45e69d1e03c455e27e5c479a7715",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-018.html": [
+       "45de8ed01cfd0aaa4cf2ffed393d958b80a632a0",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-019.html": [
+       "4a2d5a3fe329da6768d689ef451bf2015f88a780",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-intrinsic-size-020.html": [
+       "0369de29a2810fc98d9f9505063ea713953469c8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-normal-011.html": [
        "1743f58f14147b0d8d4310ad0daf7607ff87bd65",
        [
@@ -204752,6 +205021,19 @@
        {}
       ]
      ],
+     "filter-turbulence-invalid-001.html": [
+      "7400c8b37938f143fa701e9126c0a769d4d4de1c",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "filter-url-to-non-existent-filter-001.html": [
       "6351c903f029ce2325326a177801cdd31af4505d",
       [
@@ -232860,7 +233142,7 @@
     "relations": {
      "css-styling": {
       "color-001.html": [
-       "bc4b17730c9c1c0981562ea0ebe04d4f0d68e4f8",
+       "a80fade2de68d2b9fafdfa659a62ce32fca2174d",
        [
         null,
         [
@@ -232873,7 +233155,7 @@
        ]
       ],
       "color-002.html": [
-       "177333830e5f89a36942f1a11278e2dc90d1e37d",
+       "b7458bd69625c3a018ebb56f8f5d2e5a7fcdf4af",
        [
         null,
         [
@@ -232886,7 +233168,7 @@
        ]
       ],
       "color-003.html": [
-       "2422ffdf09f3cfdc73972267542dd82f1a3cd152",
+       "3166de14a8ee6cc6d3c163a4f1d849dc2d9670d9",
        [
         null,
         [
@@ -232899,7 +233181,7 @@
        ]
       ],
       "color-004.html": [
-       "65f6c4469ad6ade177b4d2b6b8d32fc5038c430b",
+       "251cd0530fbe78be40533e250655c34cca7baa7d",
        [
         null,
         [
@@ -266586,10 +266868,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "660000_color.png": [
         "a53c4d814db1836583f0d4dd7137879316cb2169",
         []
@@ -267178,10 +267456,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -268234,10 +268508,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "7f0000_color.png": [
         "73c14d8efc4f2aee16f3eeef9655c7d38f63c72b",
         []
@@ -268740,10 +269010,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -268936,10 +269202,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -269600,10 +269862,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "7f0000_color.png": [
         "73c14d8efc4f2aee16f3eeef9655c7d38f63c72b",
         []
@@ -271432,10 +271690,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -271756,10 +272010,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -271908,10 +272158,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -272542,10 +272788,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -272827,10 +273069,6 @@
          "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
          []
         ],
-        "60x60-red.png": [
-         "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-         []
-        ],
         "a-green.css": [
          "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
          []
@@ -273614,10 +273852,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "README": [
         "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
         []
@@ -275166,10 +275400,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -275846,10 +276076,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -278020,10 +278246,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -278221,10 +278443,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -278668,10 +278886,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -279598,10 +279812,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -279850,10 +280060,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -280310,10 +280516,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -280526,10 +280728,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "README": [
         "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
         []
@@ -280876,10 +281074,6 @@
         "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
         []
        ],
-       "60x60-red.png": [
-        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-        []
-       ],
        "a-green.css": [
         "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
         []
@@ -284771,10 +284965,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -285745,10 +285935,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "blue-100x100.png": [
        "3b72d5ce53c07b68fe508bb57aa61a933dbda768",
        []
@@ -286870,10 +287056,6 @@
       "e2ea7ccc6977c7e05878d7d2ed269c7189cb5425",
       []
      ],
-     "flexbox_margin-auto-overflow-2-ref.html": [
-      "cc50462460f0f6a38895ac4cdfb9e6e4aa05f31b",
-      []
-     ],
      "flexbox_margin-auto-overflow-ref.html": [
       "628cbd740edd78e3f01699bc943fe596c0546075",
       []
@@ -287161,10 +287343,6 @@
        "146242074b223b53936ececd82d0a40c4d4cc95c",
        []
       ],
-      "flex-align-items-center-ref.html": [
-       "6494dceb2b3aa959a9b5af543d4a18f8b42a542d",
-       []
-      ],
       "flex-box-float-ref.html": [
        "726257dbf854db58619b3181eac1d4d00906dad7",
        []
@@ -287205,10 +287383,6 @@
        "a97de6e826a08e09a1f1a7aa770831d5fbe0441b",
        []
       ],
-      "flex-items-flexibility.html": [
-       "8ee5118da6f7e8b0e430a0fbf085f5ebc104e8e0",
-       []
-      ],
       "flex-margin-no-collapse-ref.html": [
        "eac4ed57d53ac947b2bd3418e73c169a65ed35b8",
        []
@@ -287431,10 +287605,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -288285,10 +288455,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -295029,6 +295195,14 @@
        "474f16b5fa3aec7bf80521d341a2d71a15b2c4aa",
        []
       ],
+      "grid-container-auto-margins-scrollbars-001-ref.html": [
+       "89ac3a3c92e48f9953d12b9aece3bec9eee95ed9",
+       []
+      ],
+      "grid-container-scrollbars-sizing-001-ref.html": [
+       "a090f7955907bd1819b22d54b8cb0bf966d93e0a",
+       []
+      ],
       "grid-different-gutters-ref.html": [
        "57d27ff3aaea88eaeeed6f34f8ac49623b409fd2",
        []
@@ -295304,10 +295478,18 @@
      ],
      "image-orientation": {
       "reference": {
+       "image-orientation-background-image-ref.html": [
+        "e570906479841cf84c1d141f7b93ffe5afd31094",
+        []
+       ],
        "image-orientation-background-properties-ref.html": [
         "0d2aabc4d00d057b1fca18597602847d04513943",
         []
        ],
+       "image-orientation-border-image-ref.html": [
+        "3f9b68832b1223acafeb8bfe876fba9fc3efbfc3",
+        []
+       ],
        "image-orientation-default-ref.html": [
         "a146af365758be1453c769e01b7cfb999ba2a525",
         []
@@ -295324,6 +295506,14 @@
         "c569690967ed1494c48464922272dccc7a6aad7f",
         []
        ],
+       "image-orientation-list-style-image-ref.html": [
+        "433cf98e636b87010569aba9f42a2cafc1f99933",
+        []
+       ],
+       "image-orientation-mask-image-ref.html": [
+        "ff07824415122d56379165942706ca022fce8480",
+        []
+       ],
        "image-orientation-none-content-images-ref.html": [
         "5192f5c35aa6c0055594b662bc18f12feb453e87",
         []
@@ -295505,10 +295695,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -296232,6 +296418,10 @@
         "f718ea6abfbab54333ba674ff0dcd320d8672bcd",
         []
        ],
+       "clip-path-reference-box-004-ref.html": [
+        "3464a4712a2c4bb6b8a0a858a9048e43262144d0",
+        []
+       ],
        "clip-path-reference-restore-ref.html": [
         "683511fd8007f87aa34cf98edc0b5c327b8036a7",
         []
@@ -297151,10 +297341,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -297581,10 +297767,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -299027,10 +299209,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -299401,10 +299579,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -301137,10 +301311,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -303315,10 +303485,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "a-green.css": [
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
@@ -304129,10 +304295,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -305623,10 +305785,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -308263,10 +308421,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -308519,10 +308673,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -309089,6 +309239,10 @@
        "1a8ab40d20185688033d1d71726eea43eb443229",
        []
       ],
+      "filter-turbulence-invalid-001-ref.html": [
+       "afd3facc10cb602d6f8fb3de014862194357b6cd",
+       []
+      ],
       "filter-url-to-non-existent-filter-001-ref.html": [
        "c1aeed8c441e6f72c6faa893d64ae30bdacbec06",
        []
@@ -309189,10 +309343,6 @@
        "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
        []
       ],
-      "60x60-red.png": [
-       "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
-       []
-      ],
       "README": [
        "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
        []
@@ -314273,7 +314423,7 @@
       []
      ],
      "visual.md": [
-      "de87d650247bbdff211d8fc0f9326d965e46edf6",
+      "a8ae53d0715be1ddcf9a2033572cb2d4e92b91f1",
       []
      ],
      "wdspec.md": [
@@ -316435,11 +316585,11 @@
     ],
     "resources": {
      "crossiframe-childframe.html": [
-      "2b0d63072693fef11a87e1a6d16b89983839d513",
+      "8c42c702d6645dbbc579da47376adeb132586679",
       []
      ],
      "event-timing-test-utils.js": [
-      "3ba272f9341c4a59b5e8fbfbfc2c527645406671",
+      "cc824d9cba6e795865aeb7efb5b9f173d1fb670b",
       []
      ],
      "slow-image.py": [
@@ -324499,6 +324649,10 @@
          "eec1b2cc8e36c3fb130563ec9545b1084fa84426",
          []
         ],
+        "blank.html.headers": [
+         "6604450991a122e3e241e40b1b9e0516c525389d",
+         []
+        ],
         "broadcastchannel-iframe.html": [
          "02b9bcbbe8827e590e10f70e2a2f4576a7a8ca0a",
          []
@@ -326451,12 +326605,12 @@
          "a4f14f54d60e592f3ca8b44360931898602ba6fe",
          []
         ],
-        "image-loading-lazy-below-viewport-iframe.html": [
-         "65218168f6f3b8273c9bfa4e4302bc4aeab75dc4",
+        "image-loading-lazy-below-viewport.html": [
+         "486aeb0f24f4872ebb7b384db5b44cbcf01342b7",
          []
         ],
-        "image-loading-lazy-in-viewport-iframe.html": [
-         "0b670e7e4c663ff562d9eb562e9c898a27b31d62",
+        "image-loading-lazy-in-viewport.html": [
+         "e62fc9af4c2ef1b9f03b95ad71533bdc0fd41562",
          []
         ],
         "image.png": [
@@ -339825,7 +339979,7 @@
       []
      ],
      "manifest_build.py": [
-      "1e388dfa7419a21b20503b3075c36bc11136dd7d",
+      "20f96d9a3eeec639974ca461d9d45f91c96c0170",
       []
      ],
      "pr_preview.py": [
@@ -340294,7 +340448,7 @@
      []
     ],
     "requirements_flake8.txt": [
-     "1c4fb7262e5bcf3c3ca59bd013dcd14887abf327",
+     "2a4c7e5d7b27439f49c2c7de57a585830858b004",
      []
     ],
     "requirements_mypy.txt": [
@@ -345459,7 +345613,7 @@
         []
        ],
        "executorselenium.py": [
-        "5524d70bc718f859c6d20e06c7f86029a7b141ac",
+        "45692a0488bdf6ea096cc5b75448a002e1dd6c38",
         []
        ],
        "executorservo.py": [
@@ -345467,7 +345621,7 @@
         []
        ],
        "executorservodriver.py": [
-        "f6701da34058b43da63f9f82044833da0cfb9faf",
+        "425f40223f77535d4ea34d75790e8facce30f77a",
         []
        ],
        "executorwebdriver.py": [
@@ -385082,6 +385236,13 @@
        {}
       ]
      ],
+     "position-absolute-012.html": [
+      "fb90a526251fc10dbc3272c0ac9ed244930e8b6a",
+      [
+       null,
+       {}
+      ]
+     ],
      "position-relative-percentage-top-001.html": [
       "3ec47c1d42d69330c616a87f0b22208f8d6196a6",
       [
@@ -386327,6 +386488,20 @@
       ]
      },
      "alignment": {
+      "grid-align-baseline-vertical.html": [
+       "aff424be77454d25b8e2442a3b47e44e1a67030c",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-align-baseline.html": [
+       "25744ce61e57a3b75492f569ff88fe128e61343f",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-align-content-distribution-vertical-lr.html": [
        "98d4e3c661dd9560afb71795c6869be395fa78d0",
        [
@@ -386957,6 +387132,34 @@
         {}
        ]
       ],
+      "grid-content-alignment-and-self-alignment-001.html": [
+       "4c47ffdda906c71a091d3d6a0191a7abfd8c377a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-content-alignment-and-self-alignment-002.html": [
+       "68835c0461b9e5b8425f23758e4e6addbcdd3118",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-content-alignment-auto-sized-tracks-001.html": [
+       "32c3e3e4746c74e3b6d803c745434640a58f05b5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-content-alignment-overflow-001.html": [
+       "e3e3329583702bf42ead0349b21843eb399d4453",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-content-alignment-second-pass-001.html": [
        "1d83f53a47703d7a1a1910b5151670875a1eaf58",
        [
@@ -386971,6 +387174,27 @@
         {}
        ]
       ],
+      "grid-content-alignment-with-span-001.html": [
+       "6333c13b00b58752e3facf3631de269641e4ea09",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-content-alignment-with-span-vertical-lr-001.html": [
+       "d1b256bc0ab9b9ce00f296ccba1f56756352b473",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-content-alignment-with-span-vertical-rl-001.html": [
+       "f3102a82b79e2aa267e5786fc1d958a737c25955",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-fit-content-tracks-dont-stretch-001.html": [
        "a03b549a9af3c5732b0740a4f0f2008b972dd7e7",
        [
@@ -387955,13 +388179,6 @@
         {}
        ]
       ],
-      "grid-content-alignment-and-self-alignment-001.html": [
-       "cd79210f10d7f5384def836868b2c5394db3e447",
-       [
-        null,
-        {}
-       ]
-      ],
       "grid-inline-auto-repeat-001.html": [
        "deda5656679c29cd8706762deedcf56e11d4b95d",
        [
@@ -388351,6 +388568,13 @@
         {}
        ]
       ],
+      "grid-container-margin-border-padding-scrollbar-001.html": [
+       "6aff5895953f880d088c0811e2d293e68bc9da26",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-container-sizing-constraints-001.html": [
        "38759c2c616d897edf37b8a538015b5d43aa2fdc",
        [
@@ -388358,6 +388582,27 @@
         {}
        ]
       ],
+      "grid-float-002.html": [
+       "2a849df25caaab1509bbb9521475e0f2b9a5363a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-gutters-and-flex-content-001.html": [
+       "99b04e062f90a5d0c67fafdf09b48993adbe1bb8",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-gutters-and-tracks-001.html": [
+       "ebf914dbe98018d8df9058bb42705a3b89de6f91",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-item-accepts-first-letter-001.html": [
        "32206794c345d864de2508e73a5336d91dff3837",
        [
@@ -388372,6 +388617,20 @@
         {}
        ]
       ],
+      "grid-min-max-height-001.html": [
+       "28950e4973c6e0195cf5c3d0cf45752ee2ceefbb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-size-shrink-to-fit-001.html": [
+       "4209af55fea5487a0d56ccd838b5de22de01bf0c",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-support-display-001.html": [
        "c69d0e31b04e3dcf5896c03b18c9ce987fe1161b",
        [
@@ -388403,7 +388662,7 @@
        ]
       ],
       "flex-sizing-columns-min-max-width-001.html": [
-       "6b269e5258f9eacd0f0e066035f9f7ea2333aa76",
+       "097468b7c296148bab0f2569d5e35447de5dc763",
        [
         null,
         {}
@@ -388416,6 +388675,13 @@
         {}
        ]
       ],
+      "grid-automatic-minimum-for-auto-columns-001.html": [
+       "0bac13960b53d68d05b4c1ba827e12dbcc08b66a",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-container-percentage-001.html": [
        "511e0cd99ead89649884ab7cc0852bfab09eb7da",
        [
@@ -388423,6 +388689,13 @@
         {}
        ]
       ],
+      "grid-container-percentage-002.html": [
+       "34a52937a7cf2c599405852a7d1af2f270fa14b4",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-content-distribution-must-account-for-track-sizing-001.html": [
        "907ef68668f2cbe113674e808b4e78ae0e390100",
        [
@@ -402325,7 +402598,7 @@
       ]
      ],
      "css-style-attr-decl-block.html": [
-      "9b45d66f4ff2fe38ecc0bf8003b5ae17a9ca7722",
+      "7bc37e007a707f707827e3957c521c3aa66b9f82",
       [
        null,
        {}
@@ -421858,7 +422131,7 @@
      ]
     ],
     "click-timing.html": [
-     "4544734f73fa2b81d7242f3bd17c605aa45eb078",
+     "84943f9590a9f2df83ee841503878f1e455107aa",
      [
       null,
       {
@@ -421867,7 +422140,7 @@
      ]
     ],
     "crossiframe.html": [
-     "711408684340ef27d48d0ff36ce41c70e1424d12",
+     "0376fb91f9476ef116698972c9d51d177515a311",
      [
       null,
       {
@@ -421876,6 +422149,15 @@
       }
      ]
     ],
+    "disconnect-target.html": [
+     "b395cd4181b76cbb829fd91fc49162aeb5630679",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "event-click-counts.html": [
      "d4e87c58969a3af4dadaeead894c7cc843bc51dc",
      [
@@ -421894,6 +422176,15 @@
       }
      ]
     ],
+    "event-retarget.html": [
+     "130e70092b23442f6b797af70bd87daadcd3d553",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "idlharness.any.js": [
      "5ee98548fb6f2209b8c4b5346830c0d723e68170",
      [
@@ -421983,7 +422274,7 @@
      ]
     ],
     "programmatic-click-not-observed.html": [
-     "0a189b0bc2a7fd931de7efbc40de51a11b939c23",
+     "b5b1683bd4ccdfa041e82b020f3c7dbaf92adbbf",
      [
       null,
       {
@@ -422028,7 +422319,7 @@
      ]
     ],
     "toJSON.html": [
-     "a2d7df42da5b86a48daba7fad7e7f2adf76ed039",
+     "b2de4767c42a5d3fe8a84cdef7c534afbcd44e1a",
      [
       null,
       {
@@ -438094,21 +438385,21 @@
         ]
        ],
        "image-loading-lazy-in-cross-origin-iframe-001.sub.html": [
-        "a4627cb8c25dc3f57581dcaea14b2ea4cfccea40",
+        "eed3644650605a35514f91c36f3d8959cd7f64df",
         [
          null,
          {}
         ]
        ],
        "image-loading-lazy-in-cross-origin-iframe-002.sub.html": [
-        "1d3d3bc46a6dd931295156bbfdcdf6cf26010e35",
+        "85060d2193d00f8b0807c2b04ef1df201a8ce0d6",
         [
          null,
          {}
         ]
        ],
        "image-loading-lazy-in-script-disabled-iframe.html": [
-        "05b51705e722b5d321b071c393dabb2b7c99c629",
+        "fbcadd86c99c3f3666bbe7822b04236db148002f",
         [
          null,
          {}
@@ -438136,7 +438427,7 @@
         ]
        ],
        "image-loading-lazy-move-into-script-disabled-iframe.html": [
-        "f039db5fc24d8119a3083f8fda6d4e6325e16dbf",
+        "8e22c1fb549cab4852ce2b9c0ff312b0d029f1bc",
         [
          null,
          {}
@@ -438149,6 +438440,13 @@
          {}
         ]
        ],
+       "image-loading-lazy-multiple-times.html": [
+        "7c20a3831ff081004c52f58d21834acc666c07fe",
+        [
+         null,
+         {}
+        ]
+       ],
        "image-loading-lazy-srcset.html": [
         "21c11c7233c7b8f845a31b6aa25dda14ca381960",
         [
@@ -449740,7 +450038,7 @@
      },
      "scripts": {
       "cramped-001.html": [
-       "846be4f8af157da8b1c6507185a620b47b51db49",
+       "029d0f6e9ace58401bb4e5b9f28c17147aef8825",
        [
         null,
         {}
@@ -466135,13 +466433,6 @@
       }
      ]
     ],
-    "deviceorientationabsoluteevent.https.html": [
-     "8371098a194ef5a1cdb347a9aaf2d48d2ce7a9db",
-     [
-      null,
-      {}
-     ]
-    ],
     "idlharness.https.window.js": [
      "55cfed9276b480d7f70c616fa8d815f6ec925d66",
      [
@@ -466256,6 +466547,13 @@
        {}
       ]
      ],
+     "deviceorientationabsoluteevent.https.html": [
+      "e63783f6cf479f38504bb04bcc947a08ee34c8b3",
+      [
+       null,
+       {}
+      ]
+     ],
      "multiple-event-listeners.https.html": [
       "3a8add23c947cba88fc66a1fabf3e955f5578fd5",
       [
@@ -467808,7 +468106,7 @@
      ]
     ],
     "idlharness.any.js": [
-     "585bda92dced217354f93fb5beebe6d930890c0e",
+     "32efebe98ffd472ee1010027ff966a1ef907f17d",
      [
       "performance-timeline/idlharness.any.html",
       {
@@ -494033,7 +494331,7 @@
        ]
       ],
       "SVGGraphicsElement.getBBox-01.html": [
-       "a56dc4093203bcdcdc1f8b019a52f85f71eae23a",
+       "773b06e5043d8d942b793a03d967a8acc925d5b1",
        [
         null,
         {}
@@ -538784,20 +539082,6 @@
        null,
        {}
       ]
-     ],
-     "visibility-collapse-001.htm": [
-      "6a502553aac9a15d0cc9ac602063341f330be15a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "visibility-collapse-002.htm": [
-      "3315474730f2dbd1a7d66b0bf71da7f708cedc03",
-      [
-       null,
-       {}
-      ]
      ]
     },
     "css-font-loading": {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
similarity index 67%
rename from tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
rename to tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
index f29da48a2a0..4bfb0c2053a 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -1,4 +1,4 @@
-[hit-test-floats-003.html]
+[hit-test-floats-004.html]
   [Miss float below something else]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini b/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
deleted file mode 100644
index f20284a5396..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-round-roundup.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini
deleted file mode 100644
index 4143512af62..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-size-025.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox_margin-collapse.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox_margin-collapse.html.ini
deleted file mode 100644
index e8330cbec49..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/flexbox_margin-collapse.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_margin-collapse.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini b/tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini
new file mode 100644
index 00000000000..4074c3b4906
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini
@@ -0,0 +1,253 @@
+[position-absolute-012.html]
+  [.flexbox 38]
+    expected: FAIL
+
+  [.flexbox 39]
+    expected: FAIL
+
+  [.flexbox 35]
+    expected: FAIL
+
+  [.flexbox 36]
+    expected: FAIL
+
+  [.flexbox 37]
+    expected: FAIL
+
+  [.flexbox 30]
+    expected: FAIL
+
+  [.flexbox 31]
+    expected: FAIL
+
+  [.flexbox 32]
+    expected: FAIL
+
+  [.flexbox 33]
+    expected: FAIL
+
+  [.flexbox 88]
+    expected: FAIL
+
+  [.flexbox 80]
+    expected: FAIL
+
+  [.flexbox 83]
+    expected: FAIL
+
+  [.flexbox 82]
+    expected: FAIL
+
+  [.flexbox 85]
+    expected: FAIL
+
+  [.flexbox 84]
+    expected: FAIL
+
+  [.flexbox 87]
+    expected: FAIL
+
+  [.flexbox 86]
+    expected: FAIL
+
+  [.flexbox 16]
+    expected: FAIL
+
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 18]
+    expected: FAIL
+
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 94]
+    expected: FAIL
+
+  [.flexbox 95]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 90]
+    expected: FAIL
+
+  [.flexbox 91]
+    expected: FAIL
+
+  [.flexbox 63]
+    expected: FAIL
+
+  [.flexbox 62]
+    expected: FAIL
+
+  [.flexbox 61]
+    expected: FAIL
+
+  [.flexbox 60]
+    expected: FAIL
+
+  [.flexbox 67]
+    expected: FAIL
+
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 64]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
+  [.flexbox 68]
+    expected: FAIL
+
+  [.flexbox 70]
+    expected: FAIL
+
+  [.flexbox 71]
+    expected: FAIL
+
+  [.flexbox 72]
+    expected: FAIL
+
+  [.flexbox 74]
+    expected: FAIL
+
+  [.flexbox 75]
+    expected: FAIL
+
+  [.flexbox 76]
+    expected: FAIL
+
+  [.flexbox 77]
+    expected: FAIL
+
+  [.flexbox 78]
+    expected: FAIL
+
+  [.flexbox 79]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 40]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 49]
+    expected: FAIL
+
+  [.flexbox 48]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 52]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 51]
+    expected: FAIL
+
+  [.flexbox 56]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 28]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 23]
+    expected: FAIL
+
+  [.flexbox 22]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 20]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-image.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-image.html.ini
new file mode 100644
index 00000000000..83c78aa752e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-border-image.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-border-image.html.ini
new file mode 100644
index 00000000000..7398701d813
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-border-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-border-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-list-style-image.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
new file mode 100644
index 00000000000..65600fe4b98
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-list-style-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-list-style-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-mask-image.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-mask-image.html.ini
new file mode 100644
index 00000000000..37cda176ea0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-mask-image.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-mask-image.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/white-space-intrinsic-size-013.html.ini b/tests/wpt/metadata/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
new file mode 100644
index 00000000000..9b65faf7084
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/white-space-intrinsic-size-013.html.ini
@@ -0,0 +1,2 @@
+[white-space-intrinsic-size-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index 70a00a101f6..e35a452a186 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index 130c0181e43..d96df7a0f92 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -1,628 +1,58 @@
 [properties-value-001.html]
-  [top length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(mm) / events]
-    expected: FAIL
-
   [background-position length(pt) / values]
     expected: FAIL
 
-  [width length(pt) / events]
-    expected: FAIL
-
   [background-position length(pt) / events]
     expected: FAIL
 
-  [border-bottom-width length(pc) / events]
-    expected: FAIL
-
-  [height length(ex) / events]
-    expected: FAIL
-
-  [padding-bottom length(mm) / events]
-    expected: FAIL
-
-  [border-top-width length(px) / events]
-    expected: FAIL
-
-  [border-top-width length(pt) / events]
-    expected: FAIL
-
-  [padding-top length(em) / events]
-    expected: FAIL
-
-  [max-width length(in) / events]
-    expected: FAIL
-
-  [margin-top length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(pt) / events]
-    expected: FAIL
-
-  [right length(ex) / events]
-    expected: FAIL
-
-  [max-height length(em) / events]
-    expected: FAIL
-
-  [width length(ex) / events]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / events]
-    expected: FAIL
-
-  [width percentage(%) / events]
-    expected: FAIL
-
   [background-position length(px) / values]
     expected: FAIL
 
-  [margin-top length(ex) / events]
-    expected: FAIL
-
-  [border-top-width length(in) / events]
-    expected: FAIL
-
-  [right length(em) / events]
-    expected: FAIL
-
-  [top length(ex) / events]
-    expected: FAIL
-
-  [padding-left length(px) / events]
-    expected: FAIL
-
-  [margin-top length(em) / events]
-    expected: FAIL
-
-  [left length(em) / events]
-    expected: FAIL
-
-  [margin-left length(px) / events]
-    expected: FAIL
-
   [background-position length(cm) / events]
     expected: FAIL
 
-  [max-height percentage(%) / events]
-    expected: FAIL
-
-  [bottom length(ex) / events]
-    expected: FAIL
-
-  [padding-left length(mm) / events]
-    expected: FAIL
-
-  [right length(mm) / events]
-    expected: FAIL
-
-  [margin-top length(pc) / events]
-    expected: FAIL
-
   [background-position length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / events]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / events]
-    expected: FAIL
-
-  [border-bottom-width length(in) / events]
-    expected: FAIL
-
-  [margin-bottom length(pc) / events]
-    expected: FAIL
-
-  [border-left-width length(mm) / events]
-    expected: FAIL
-
-  [height length(em) / events]
-    expected: FAIL
-
   [background-position length(in) / events]
     expected: FAIL
 
-  [height length(cm) / events]
-    expected: FAIL
-
-  [padding-top length(in) / events]
-    expected: FAIL
-
-  [max-width length(ex) / events]
-    expected: FAIL
-
-  [padding-top length(px) / events]
-    expected: FAIL
-
-  [border-top-width length(pc) / events]
-    expected: FAIL
-
-  [top length(cm) / events]
-    expected: FAIL
-
-  [left length(ex) / events]
-    expected: FAIL
-
-  [min-width length(ex) / events]
-    expected: FAIL
-
-  [left length(pc) / events]
-    expected: FAIL
-
-  [left length(in) / events]
-    expected: FAIL
-
-  [left length(px) / events]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / events]
-    expected: FAIL
-
-  [min-width length(cm) / events]
-    expected: FAIL
-
-  [padding-bottom length(px) / events]
-    expected: FAIL
-
-  [max-width percentage(%) / events]
-    expected: FAIL
-
-  [top length(in) / events]
-    expected: FAIL
-
-  [border-left-color color(rgba) / events]
-    expected: FAIL
-
-  [margin-left length(mm) / events]
-    expected: FAIL
-
-  [margin-top length(pt) / events]
-    expected: FAIL
-
-  [min-height length(cm) / events]
-    expected: FAIL
-
-  [max-height length(cm) / events]
-    expected: FAIL
-
-  [width length(mm) / events]
-    expected: FAIL
-
-  [width length(pc) / events]
-    expected: FAIL
-
   [background-position length(em) / events]
     expected: FAIL
 
-  [height length(px) / events]
-    expected: FAIL
-
-  [right percentage(%) / events]
-    expected: FAIL
-
-  [border-top-color color(rgba) / events]
-    expected: FAIL
-
-  [padding-right length(px) / events]
-    expected: FAIL
-
-  [width length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(ex) / events]
-    expected: FAIL
-
-  [border-right-width length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(em) / events]
-    expected: FAIL
-
-  [border-left-width length(ex) / events]
-    expected: FAIL
-
-  [min-width length(mm) / events]
-    expected: FAIL
-
-  [margin-right length(pc) / events]
-    expected: FAIL
-
-  [margin-left length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(pc) / events]
-    expected: FAIL
-
-  [height length(in) / events]
-    expected: FAIL
-
-  [border-left-width length(in) / events]
-    expected: FAIL
-
-  [min-height length(ex) / events]
-    expected: FAIL
-
-  [bottom length(em) / events]
-    expected: FAIL
-
-  [border-right-color color(rgba) / events]
-    expected: FAIL
-
-  [right length(in) / events]
-    expected: FAIL
-
-  [padding-top length(pt) / events]
-    expected: FAIL
-
-  [min-width length(em) / events]
-    expected: FAIL
-
-  [border-right-width length(pt) / events]
-    expected: FAIL
-
-  [padding-bottom length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(in) / events]
-    expected: FAIL
-
-  [margin-top length(px) / events]
-    expected: FAIL
-
-  [padding-top length(ex) / events]
-    expected: FAIL
-
-  [margin-left length(ex) / events]
-    expected: FAIL
-
-  [top length(px) / events]
-    expected: FAIL
-
-  [bottom length(cm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(px) / events]
-    expected: FAIL
-
-  [margin-bottom length(ex) / events]
-    expected: FAIL
-
-  [max-width length(mm) / events]
-    expected: FAIL
-
-  [height percentage(%) / events]
-    expected: FAIL
-
-  [border-right-width length(px) / events]
-    expected: FAIL
-
-  [border-top-width length(mm) / events]
-    expected: FAIL
-
-  [border-left-width length(em) / events]
-    expected: FAIL
-
-  [max-width length(pc) / events]
-    expected: FAIL
-
-  [padding-bottom length(em) / events]
-    expected: FAIL
-
-  [min-width length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(in) / events]
-    expected: FAIL
-
-  [bottom length(in) / events]
-    expected: FAIL
-
-  [padding-right length(mm) / events]
-    expected: FAIL
-
-  [border-left-width length(px) / events]
-    expected: FAIL
-
-  [left length(cm) / events]
-    expected: FAIL
-
   [background-position length(ex) / values]
     expected: FAIL
 
-  [margin-right length(px) / events]
-    expected: FAIL
-
-  [margin-left length(cm) / events]
-    expected: FAIL
-
-  [min-width length(in) / events]
-    expected: FAIL
-
-  [padding-right length(cm) / events]
-    expected: FAIL
-
-  [width length(em) / events]
-    expected: FAIL
-
   [background-position length(cm) / values]
     expected: FAIL
 
-  [margin-left length(em) / events]
-    expected: FAIL
-
-  [margin-right length(cm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / events]
-    expected: FAIL
-
-  [bottom length(pc) / events]
-    expected: FAIL
-
-  [top percentage(%) / events]
-    expected: FAIL
-
-  [padding-left length(pt) / events]
-    expected: FAIL
-
-  [min-width percentage(%) / events]
-    expected: FAIL
-
-  [right length(px) / events]
-    expected: FAIL
-
-  [padding-right length(in) / events]
-    expected: FAIL
-
-  [left length(mm) / events]
-    expected: FAIL
-
-  [bottom length(px) / events]
-    expected: FAIL
-
-  [padding-left length(pc) / events]
-    expected: FAIL
-
-  [padding-left length(cm) / events]
-    expected: FAIL
-
-  [left length(pt) / events]
-    expected: FAIL
-
-  [padding-left length(ex) / events]
-    expected: FAIL
-
-  [margin-bottom length(cm) / events]
-    expected: FAIL
-
-  [max-width length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(em) / events]
-    expected: FAIL
-
-  [margin-left length(in) / events]
-    expected: FAIL
-
-  [top length(em) / events]
-    expected: FAIL
-
-  [padding-right length(pt) / events]
-    expected: FAIL
-
-  [padding-top length(pc) / events]
-    expected: FAIL
-
-  [border-top-width length(ex) / events]
-    expected: FAIL
-
-  [min-height length(pt) / events]
-    expected: FAIL
-
-  [width length(in) / events]
-    expected: FAIL
-
-  [min-width length(pc) / events]
-    expected: FAIL
-
-  [margin-bottom length(mm) / events]
-    expected: FAIL
-
-  [height length(pc) / events]
-    expected: FAIL
-
   [background-position length(ex) / events]
     expected: FAIL
 
-  [max-width length(px) / events]
-    expected: FAIL
-
-  [bottom length(pt) / events]
-    expected: FAIL
-
-  [padding-right length(ex) / events]
-    expected: FAIL
-
-  [border-top-width length(em) / events]
-    expected: FAIL
-
-  [max-height length(pt) / events]
-    expected: FAIL
-
-  [margin-left length(pc) / events]
-    expected: FAIL
-
-  [min-height percentage(%) / events]
-    expected: FAIL
-
-  [padding-bottom length(ex) / events]
-    expected: FAIL
-
-  [padding-left length(em) / events]
-    expected: FAIL
-
-  [bottom percentage(%) / events]
-    expected: FAIL
-
-  [min-height length(pc) / events]
-    expected: FAIL
-
-  [border-left-width length(pc) / events]
-    expected: FAIL
-
-  [margin-bottom length(in) / events]
-    expected: FAIL
-
-  [margin-bottom length(em) / events]
-    expected: FAIL
-
-  [top length(mm) / events]
-    expected: FAIL
-
   [background-position length(pc) / events]
     expected: FAIL
 
-  [bottom length(mm) / events]
-    expected: FAIL
-
-  [padding-top length(mm) / events]
-    expected: FAIL
-
-  [border-right-width length(ex) / events]
-    expected: FAIL
-
-  [border-top-width length(cm) / events]
-    expected: FAIL
-
-  [right length(pt) / events]
-    expected: FAIL
-
-  [width length(px) / events]
-    expected: FAIL
-
-  [height length(pt) / events]
-    expected: FAIL
-
   [background-position length(in) / values]
     expected: FAIL
 
-  [padding-left length(in) / events]
-    expected: FAIL
-
-  [min-height length(em) / events]
-    expected: FAIL
-
-  [left percentage(%) / events]
-    expected: FAIL
-
-  [padding-bottom length(pc) / events]
-    expected: FAIL
-
-  [max-height length(ex) / events]
-    expected: FAIL
-
-  [border-left-width length(cm) / events]
-    expected: FAIL
-
-  [max-height length(pc) / events]
-    expected: FAIL
-
-  [padding-right length(pc) / events]
-    expected: FAIL
-
-  [top length(pc) / events]
-    expected: FAIL
-
-  [min-height length(px) / events]
-    expected: FAIL
-
-  [margin-right length(mm) / events]
-    expected: FAIL
-
-  [max-height length(mm) / events]
-    expected: FAIL
-
   [background-position length(pc) / values]
     expected: FAIL
 
-  [right length(pc) / events]
-    expected: FAIL
-
   [background-position percentage(%) / values]
     expected: FAIL
 
-  [padding-top length(cm) / events]
-    expected: FAIL
-
-  [right length(cm) / events]
-    expected: FAIL
-
   [background-position length(mm) / events]
     expected: FAIL
 
-  [min-height length(in) / events]
-    expected: FAIL
-
-  [max-width length(cm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / events]
-    expected: FAIL
-
-  [max-height length(px) / events]
-    expected: FAIL
-
-  [min-width length(px) / events]
-    expected: FAIL
-
-  [margin-top length(in) / events]
-    expected: FAIL
-
   [background-position length(em) / values]
     expected: FAIL
 
-  [margin-bottom length(pt) / events]
-    expected: FAIL
-
-  [max-width length(em) / events]
-    expected: FAIL
-
-  [padding-bottom length(pt) / events]
-    expected: FAIL
-
-  [min-height length(mm) / events]
-    expected: FAIL
-
-  [padding-bottom length(in) / events]
-    expected: FAIL
-
-  [margin-bottom length(px) / events]
-    expected: FAIL
-
-  [max-height length(in) / events]
-    expected: FAIL
-
   [background-position percentage(%) / events]
     expected: FAIL
 
-  [padding-right length(em) / events]
-    expected: FAIL
-
-  [height length(mm) / events]
-    expected: FAIL
-
-  [margin-top length(mm) / events]
-    expected: FAIL
-
   [background-position length(px) / events]
     expected: FAIL
 
-  [border-bottom-width length(em) / events]
-    expected: FAIL
-
   [outline-width length(px) / values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-003.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-003.html.ini
index 1b627456814..95ae1c11729 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-003.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-003.html.ini
@@ -509,27 +509,3 @@
   [display display(static to absolute) / values]
     expected: FAIL
 
-  [border-bottom-left-radius border-radius(px-px) / events]
-    expected: FAIL
-
-  [border-top-right-radius border-radius(px-px) / events]
-    expected: FAIL
-
-  [border-bottom-right-radius border-radius(px-px) / events]
-    expected: FAIL
-
-  [border-top-right-radius border-radius(px) / events]
-    expected: FAIL
-
-  [border-bottom-left-radius border-radius(px) / events]
-    expected: FAIL
-
-  [border-top-left-radius border-radius(px) / events]
-    expected: FAIL
-
-  [border-bottom-right-radius border-radius(px) / events]
-    expected: FAIL
-
-  [border-top-left-radius border-radius(px-px) / events]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/filter-effects/filter-turbulence-invalid-001.html.ini b/tests/wpt/metadata/css/filter-effects/filter-turbulence-invalid-001.html.ini
new file mode 100644
index 00000000000..0ec7afa5e66
--- /dev/null
+++ b/tests/wpt/metadata/css/filter-effects/filter-turbulence-invalid-001.html.ini
@@ -0,0 +1,2 @@
+[filter-turbulence-invalid-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 6dcb54ae103..329b4d4131b 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,12 +312,6 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
@@ -327,12 +321,15 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 2d5faa72ac7..b2ffc8abf78 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index ced66541669..e836f08c992 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -18,3 +18,18 @@
   [Set HTTP URL frame location.protocol to ftp]
     expected: FAIL
 
+  [Set data URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to file]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to http+x]
+    expected: FAIL
+
+  [Set data URL frame location.protocol to ftp]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 8b743f36e1d..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,20 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index fc37df7e3fa..2a166bb97b7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
index e0dbfe20eec..3a21d76c7a5 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html.ini
@@ -2,3 +2,6 @@
   [An image with loading='lazy' in cross origin iframe loads when it gets\n       visible by scrolling the iframe's scroll port]
     expected: FAIL
 
+  [A below-viewport loading=lazy image in a cross origin iframe loads only\n       when scrolled into viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
index d6b89175dea..f726bb183a8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html.ini
@@ -2,3 +2,6 @@
   [An image with loading='lazy' in cross origin iframe loads when it gets\n       visible by scrolling the parent scroll container of the iframe]
     expected: FAIL
 
+  [A loading=lazy image in a below-viewport cross-origin iframe loads only\n       when the cross-origin iframe is scrolled into view]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
new file mode 100644
index 00000000000..7e0b1b52d2a
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html.ini
@@ -0,0 +1,4 @@
+[image-loading-lazy-multiple-times.html]
+  [Images with loading='lazy' can be lazy loaded multiple times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 5934ad00ad2..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -1,9 +1,6 @@
 [compile-event-handler-settings-objects.html]
   type: testharness
   expected: TIMEOUT
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 636cb8a14da..d1775aae3d1 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -155,3 +155,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44047 more errors.\n\tMax AbsError of 1.9999794363975525e+0 at index of 37272.\n\t[37272\]\t9.9997943639755249e-1\t-1.0000000000000000e+0\t1.9999794363975525e+0\t1.9999794363975525e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 40518 more errors.\n\tMax AbsError of 1.9880115985870361e+0 at index of 23190.\n\t[23190\]\t9.9948620796203613e-1\t-9.8852539062500000e-1\t1.9880115985870361e+0\t2.0110880483607065e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index fe8654e447c..00000000000
--- a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht
index 77d0ab69dee..e7c0859ede4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht
@@ -18,7 +18,7 @@
 
   tbody
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht
index f64d6c3eb73..50e5cc9040a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht
@@ -18,7 +18,7 @@
 
   tbody
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht
index 816c8f38bb9..46788a0726d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht
@@ -18,7 +18,7 @@
 
   div#tbody
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-row-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht
index 78fe69a43a9..87c15b14080 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht
@@ -18,7 +18,7 @@
 
   div#tbody
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-row-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht
index af0edca4857..56b61df91f6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht
@@ -18,7 +18,7 @@
 
   thead
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht
index 1092a7329a9..9b16866f682 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht
@@ -18,7 +18,7 @@
 
   thead
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht
index 2c68171a07d..e20d44894b6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht
@@ -18,7 +18,7 @@
 
   div#thead
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-header-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht
index 361253cea47..1cc1609ec98 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht
@@ -18,7 +18,7 @@
 
   div#thead
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-header-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht
index 21c4bad9760..0f12bae1b75 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht
@@ -18,7 +18,7 @@
 
   tfoot
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht
index daac448efa8..7728652b5bc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht
@@ -18,7 +18,7 @@
 
   tfoot
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht
index 4c89a652b4d..40ac5243f7d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht
@@ -18,7 +18,7 @@
 
   div#tfoot
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-footer-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht
index af804e7302f..896e887ee6d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht
@@ -18,7 +18,7 @@
 
   div#tfoot
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-footer-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht
index c2921ed8599..6ab399b755e 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht
@@ -18,7 +18,7 @@
 
   colgroup
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht
index cf625e83c62..913785bb190 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht
@@ -18,7 +18,7 @@
 
   colgroup
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht
index 0ff3849313c..e5bdd458074 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht
@@ -18,7 +18,7 @@
 
   div#colgroup
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-column-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht
index 43e4d55be51..792b77c7a51 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht
@@ -18,7 +18,7 @@
 
   div#colgroup
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-column-group;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht
index ea4f76b0e2b..25b8e7a2789 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht
@@ -18,7 +18,7 @@
 
   col#tested-col
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht
index 38ca037ef60..ac6ff54a09e 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht
@@ -18,7 +18,7 @@
 
   col#tested-col
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht
index fa83b06bbaa..293a596964c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht
@@ -20,7 +20,7 @@
 
   div#tested-col
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-column;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht
index db6436e3aad..328e43d3da3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht
@@ -20,7 +20,7 @@
 
   div#tested-col
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table-column;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht
index 768f3da7e43..4fa7e0642a1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht
@@ -16,7 +16,7 @@
   <style type="text/css"><![CDATA[
   div#table
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht
index 44cb5257acb..fd1e6c4c493 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht
@@ -16,7 +16,7 @@
   <style type="text/css"><![CDATA[
   div#table
   {
-  background-image: url("support/60x60-red.png");
+  background-image: url("/css/support/60x60-red.png");
   background-position: bottom right;
   background-repeat: no-repeat;
   display: table;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht
index 229a9a2e10c..207426af57c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style type="text/css">
    .container { font: 30px/1 Ahem; color: green; margin: 0; padding: 0; border: 0;
-                background: url(support/60x60-red.png) no-repeat;
+                background: url(/css/support/60x60-red.png) no-repeat;
                 text-indent: 0; }
    .float { width: 1em; height: 1em; background: green; float: left;
             margin: 0; padding: 0; border: 0; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-red.png b/tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html
index 3b7d4642f77..8652495f573 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html
@@ -22,7 +22,7 @@
         }
         #test-overlapped-red {
             background-clip: padding-box;
-            background-image: url(support/60x60-red.png);
+            background-image: url(/css/support/60x60-red.png);
             background-origin: border-box;
             background-position: top left;
             background-repeat: no-repeat;
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html
index 7efbe187118..e6b278de0e5 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html
@@ -11,7 +11,7 @@
     <meta name="assert" content="Check if 'background-size' is '0px', minimum width of the positioning area in length, then such value is the width of the corresponding image and therefore the background image is not to be displayed.">
     <style>
         div {
-            background-image: url(support/60x60-red.png);
+            background-image: url(/css/support/60x60-red.png);
             background-size: 0px;
             height: 100px;
             width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html
index c9ac0d82f68..578fcdc79a6 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html
@@ -11,7 +11,7 @@
     <meta name="assert" content="Check if 'background-size' is '0%', minimum width of the positioning area in percentage, then such value is the width of the corresponding image and therefore the background image is not to be displayed.">
     <style>
         div {
-            background-image: url(support/60x60-red.png);
+            background-image: url(/css/support/60x60-red.png);
             background-size: 0%;
             height: 100px;
             width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html b/tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html
index ff8e50b9cc4..a9ca550ce3d 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html
@@ -19,7 +19,7 @@ and the element is scrolled to (0, 60px), only the second image is shown." />
 #element-with-attachment-scroll {
     width: 500px;
     height: 500px;
-    background-image: url('support/60x60-red.png'), url('support/60x60-green.png');
+    background-image: url('/css/support/60x60-red.png'), url('support/60x60-green.png');
     background-position: 0 0, 0 60px;
     background-repeat: no-repeat;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-items-center.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-items-center.html
deleted file mode 100644
index 2e239e83c14..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-items-center.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>CSS Flex-basis Test</title>
-		<link rel="author" title="Chunsheng Zhang" href="mailto:zhangcs_423@163.com" />
-		<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#alignment" />
-		<link rel="match" href="reference/flex-align-items-center-ref.html" />
-		<meta name="assert" content="flex items center" />
-		<style type="text/css">
-			#container {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border: 5px solid green;
-				width: 600px;
-				height: 200px;
-				padding: 5px;
-				border-radius: 3px;
-				position: absolute;
-				top: 70px;
-				left: 10px;
-			}
-			#container > div {
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				padding: 10px;
-				width: 30px;
-				height: 40px;
-				text-align: center;
-				flex: none;
-			}
-			#fail-flag {
-				position: absolute;
-				top: 162px;
-				left: 272px;
-				width: 92px;
-				height: 36px;
-				background: red;
-			}
-		</style>
-	</head>
-	<body>
-		<p>This case tests that flex items center</p>
-		<p>The test passes if there is no red</p>
-		<div id="fail-flag"></div>
-		<section id="container">
-			<div></div>
-			<div></div>
-			<div></div>
-		</section>
-	</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-items-flexibility.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-items-flexibility.html
deleted file mode 100644
index 0f7cbe72528..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-items-flexibility.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>CSS Flex-basis Test</title>
-		<link rel="author" title="Chunsheng Zhang" href="mailto:zhangcs_423@163.com" />
-		<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flexibility" />
-		<link rel="match" href="reference/flex-items-flexibility.html" />
-		<meta name="assert" content="flex items flexibility" />
-		<style type="text/css">
-			#container {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border: 5px solid green;
-				width: 600px;
-				height: 200px;
-				padding: 5px;
-				border-radius: 3px;
-				position: absolute;
-				top: 70px;
-				left: 10px;
-			}
-			div {
-				padding: 10px;
-				width: 30px;
-				height: 40px;
-				text-align: center;
-				flex: 1 0 auto;
-			}
-			#flex {
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				flex: 2 0 auto;
-			}
-			#fail-flag {
-				position: absolute;
-				padding: 10px;
-				top: 150px;
-				left: 183px;
-				width: 254px;
-				height: 40px;
-				background: red;
-			}
-		</style>
-	</head>
-	<body>
-		<p>This case tests that flex items flexibility</p>
-		<p>The test passes if there is no red</p>
-		<div id="fail-flag"></div>
-		<section id="container">
-			<div></div>
-			<div id="flex"></div>
-			<div></div>
-		</section>
-	</body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html
index bfb4c9255e5..b2bb8a3ede7 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>flexbox | flexcontainer via generated content</title>
 <link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-container">
+<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-containers">
 <link rel="match" href="flexbox_generated-flex-ref.html">
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html
index bb7d35a94a2..2a095c16e44 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>flexbox | flexcontainer via generated content</title>
 <link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-container">
+<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-containers">
 <link rel="match" href="flexbox_generated-flex-ref.html">
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html
index 892e26e5c2e..1c84d8803ec 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>flexbox | flexcontainer vs generated content</title>
 <link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-container">
+<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-containers">
 <link rel="match" href="flexbox_generated-ref.html">
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2-ref.html
deleted file mode 100644
index cc50462460f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<title>flexbox | margin: auto in overflow</title>
-<link rel="author" href="http://opera.com" title="Opera Software">
-<style>
-div {
-	background: blue;
-	margin: 1em 0;
-	border: 1px solid black;
-	height: 8em;
-	width: 32em;
-	position: relative;
-}
-span {
-	background: white;
-	margin: 0;
-	width: 12em;
-	height: 6em;
-	position: absolute;
-	left: 0;
-	top: 1em;
-	display: inline-block;
-}
-span+span {
-	background: yellow;
-	width: 30em;
-	left: 12em;
-}
-</style>
-
-<div>
-	<span>one</span>
-	<span>two</span>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2.html
deleted file mode 100644
index 1b53848ac82..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-2.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<title>flexbox | margin: auto in overflow</title>
-<link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#auto-margins">
-<link rel="match" href="flexbox_margin-auto-overflow-2-ref.html">
-<style>
-div {
-	background: blue;
-	margin: 1em 0;
-	border: 1px solid black;
-	height: 8em;
-	width: 32em;
-	position: relative;
-
-	display: flex;
-}
-span {
-	background: white;
-	margin: 1em auto;
-	width: 12em;
-	display: inline-block;
-	flex: 0 0 auto;
-}
-span+span {
-	background: yellow;
-	width: 30em;
-}
-</style>
-
-<div>
-	<span>one</span>
-	<span>two</span>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse.html
deleted file mode 100644
index 5fbe577bbc5..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>flexbox | flexitem margin collapsing</title>
-<link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help"
-	href="http://www.w3.org/TR/css-flexbox-1/#visibility-collapse">
-<link rel="match" href="flexbox_margin-collapse-ref.html">
-<style>
-body {
-	margin: 0;
-}
-div {
-	background: blue;
-	border: 1px solid black;
-	display: flex;
-	flex-direction: column;
-}
-p {
-	margin: 1em 0;
-}
-</style>
-
-<div>
-	<p>filler</p>
-	<p>filler</p>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html
index 7b12807ea8d..ea57ef28013 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>flexbox | margin-left: auto</title>
 <link rel="author" href="http://opera.com" title="Opera Software">
-<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#item-margins">
+<link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#auto-margins">
 <link rel="match" href="flexbox_margin-left-ex-ref.html">
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html
new file mode 100644
index 00000000000..011daa6695c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid." />
+
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: grid; position: relative;">
+  <div style="display: flex; align-items: center; background: red">
+    <div style="position: absolute; background: green">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html
new file mode 100644
index 00000000000..2bf8d637d2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for abspos item when containing block is root element." />
+
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: flex; align-items: center; background: red">
+  <div style="position: absolute; background: green">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html
new file mode 100644
index 00000000000..822e8b33397
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and alignment is flex-end." />
+
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: grid; position: relative;">
+  <div style="display: flex; align-items: flex-end; background: red">
+    <div style="position: absolute; background: green">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html
new file mode 100644
index 00000000000..c5e69e09149
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and abspos item is also grid." />
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: grid; position: relative;">
+  <div style="display: flex; align-items: center; background: red">
+    <div style="position: absolute; background: green; display: grid">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html
new file mode 100644
index 00000000000..64c228e3487
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for grid abspos item when containg block is regular block flow." />
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="position: relative;">
+  <div style="display: flex; align-items: center; background: red">
+    <div style="position: absolute; background: green; display: grid">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html
new file mode 100644
index 00000000000..d4cc862c301
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>abspos items</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="bookmark" href="https://crbug.com/1066859">
+<meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and weird abspos edge is due to justify-content, not alignment." />
+
+<style>
+div {
+  height: 100px;
+  width: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: grid; position: relative;">
+  <div style="display: flex; justify-content: flex-end; background: red">
+    <div style="position: absolute; background: green">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html
new file mode 100644
index 00000000000..fb90a526251
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Test: Absolutely positioned children of flexboxes</title>
+<link rel="author" title="Google Inc." href="http://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+<meta name="flags" content="">
+<meta name="assert" content="Checks that we correctly position abspos children in a number of writing modes and alignments when containing block is grid.">
+<style>
+
+.abspos {
+  height: 50px;
+  width: 50px;
+  background: lightblue;
+  position: absolute;
+  flex: none;
+}
+
+.grid {
+  display: grid;
+  position: relative;
+}
+
+.title {
+    margin-top: 1em;
+}
+
+.flexbox {
+    display: flex;
+    background-color: #aaa;
+    height: 100px;
+    width: 100px;
+}
+
+.horizontal-tb {
+    writing-mode: horizontal-tb;
+}
+.vertical-rl {
+    writing-mode: vertical-rl;
+}
+.vertical-lr {
+    writing-mode: vertical-lr;
+}
+
+.rtl {
+    direction: rtl;
+}
+.ltr {
+    direction: ltr;
+}
+
+.align-items-flex-start {
+    align-items: flex-start;
+}
+.align-items-flex-end {
+    align-items: flex-end;
+}
+.justify-content-flex-start {
+    justify-content: flex-start;
+}
+.justify-content-flex-end {
+    justify-content: flex-end;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.flexbox')">
+<div id=log></div>
+<script>
+
+var writingModes = ['horizontal-tb', 'vertical-rl', 'vertical-lr'];
+var directions = ['ltr', 'rtl'];
+var justifyContents = ['flex-start', 'flex-end'];
+var alignItems = ['flex-start', 'flex-end'];
+var flexDirections = ['row', 'column', 'row-reverse', 'column-reverse'];
+
+// These were harvested from Firefox 76.0b4.
+var x = [0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50];
+
+var y = [0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0, 0, 0, 50, 50, 50, 50, 0, 0];
+
+var test_number = 1;
+
+writingModes.forEach(function(flexWritingMode) {
+    flexDirections.forEach(function(flexDirection) {
+      directions.forEach(function(direction) {
+        justifyContents.forEach(function(justifyContent) {
+          alignItems.forEach(function(alignment) {
+            var flexboxClassName = flexWritingMode + ' ' + direction + ' ' + flexDirection + ' justify-content-' + justifyContent + ' align-items-' + alignment;
+            var title = document.createElement('div');
+            title.className = 'title';
+            title.innerHTML = flexboxClassName + " .flexbox " + (test_number++);
+            document.body.appendChild(title);
+
+            var flexbox = document.createElement('div');
+            flexbox.className = 'flexbox ' + flexboxClassName;
+
+            var child = document.createElement('div');
+            child.setAttribute('class', 'abspos');
+            child.setAttribute("data-offset-x", x.shift());
+            child.setAttribute("data-offset-y", y.shift());
+            flexbox.appendChild(child);
+
+            var relpos = document.createElement('div');
+            relpos.className = 'grid';
+            relpos.appendChild(flexbox);
+
+            document.body.appendChild(relpos);
+          })
+        })
+      })
+  })
+})
+
+</script>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-items-center-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-items-center-ref.html
deleted file mode 100644
index 6494dceb2b3..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-items-center-ref.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>CSS Flex-basis Test</title>
-		<link rel="author" title="Chunsheng Zhang" href="mailto:zhangcs_423@163.com" />
-		<style type="text/css">
-			#container {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border: 5px solid green;
-				width: 600px;
-				height: 200px;
-				padding: 5px;
-				border-radius: 3px;
-				position: absolute;
-				top: 70px;
-				left: 10px;
-			}
-			#a {
-				top: 148px;
-				left: 239px;
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				padding: 10px;
-				width: 30px;
-				height: 40px;
-				text-align: center;
-				flex: none;
-			}
-			#b {
-				top: 148px;
-				left: 293px;
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				padding: 10px;
-				width: 30px;
-				height: 40px;
-				text-align: center;
-				flex: none;
-			}
-			#c {
-				top: 148px;
-				left: 347px;
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				padding: 10px;
-				width: 30px;
-				height: 40px;
-				text-align: center;
-				flex: none;
-			}
-		</style>
-	</head>
-	<body>
-		<p>This case tests that flex items center</p>
-		<p>The test passes if there is no red</p>
-		<section id="container">
-		</section>
-		<div id="a" style="position:absolute"></div>
-		<div id="b" style="position:absolute"></div>
-		<div id="c" style="position:absolute"></div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-items-flexibility.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-items-flexibility.html
deleted file mode 100644
index 8ee5118da6f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-items-flexibility.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>CSS Flex-basis Test</title>
-		<link rel="author" title="Chunsheng Zhang" href="mailto:zhangcs_423@163.com" />
-		<style type="text/css">
-			#container {
-				border: 5px solid green;
-				width: 600px;
-				height: 200px;
-				padding: 5px;
-				border-radius: 3px;
-				position: absolute;
-				top: 70px;
-				left: 10px;
-			}
-			#flex {
-				border: 2px dotted blue;
-				background: green;
-				border-radius: 3px;
-				position: absolute;
-				top: 73px;
-				left: 166.5px;
-				width: 253px;
-                height: 40px;
-                padding: 10px;
-			}
-		</style>
-	</head>
-	<body>
-		<p>This case tests that flex items flexibility</p>
-		<p>The test passes if there is no red</p>
-		<section id="container">
-			<div id="flex"></div>
-		</section>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-001.htm b/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-001.htm
deleted file mode 100644
index 6a502553aac..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-001.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: A flex item with the 'visibility' property set to 'collapse' should not take up space in the main axis</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#visibility-collapse" />
-        <meta name="flags" content="">
-        <meta name="assert" content="This test checks that a flex item with 'visibility: collapse' doesn't take up space in the main axis." />
-        <style type="text/css">
-            #flexbox
-            {
-                display: flex;
-                flex-flow: column;
-                width: 300px;
-            }
-            div div
-            {
-                background-color: green;
-                height: 50px;
-            }
-            #flexbox, #collapse
-            {
-                background-color: red;
-            }
-            #collapse
-            {
-                visibility: collapse;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is no red visible on the page.</p>
-        <div id="flexbox">
-            <div></div>
-            <div id="collapse"></div>
-            <div></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-002.htm b/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-002.htm
deleted file mode 100644
index 3315474730f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/visibility-collapse-002.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: A flex item with the 'visibility' property set to 'collapse' should be large enough to fit the collapsed item</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#visibility-collapse" />
-        <meta name="flags" content="">
-        <meta name="assert" content="This test checks that the cross size of a line of flex items containing an item with 'visbility: collapse' is large enough to fit the collapsed item." />
-        <style type="text/css">
-            #flexbox
-            {
-                display: flex;
-                height: 100px;
-                width: 300px;
-            }
-            div div
-            {
-                background-color: green;
-                width: 150px;
-            }
-            #flexbox, #collapse
-            {
-                background-color: red;
-            }
-            #collapse
-            {
-                visibility: collapse;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is no red visible on the page.</p>
-        <span></span>
-        <div id="flexbox">
-           <div></div>
-           <div id="collapse"></div>
-           <div></div>
-        </div>
-    </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-fonts/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html
new file mode 100644
index 00000000000..aff424be774
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid align baseline vertical</title>
+<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#intro-baselines">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-rules">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-self">
+<meta name="assert" content="This test checks that baseline alignment works correctly for align-self properties in vertical-rl and -lr writing modes">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+
+<style>
+
+.grid {
+    height: 600px;
+    grid-auto-columns: 1fr;
+    margin-bottom: 20px;
+    position: relative;
+    text-orientation: sideways;
+    font: 20px/1 Ahem;
+}
+
+.grid :nth-child(1) { background-color: brown; }
+.grid :nth-child(2) { background-color: green; }
+.grid :nth-child(3) { background-color: red; }
+.grid :nth-child(4) { background-color: yellow; }
+.grid :nth-child(5) { background-color: purple; }
+.grid :nth-child(6) { background-color: orange; }
+.grid :nth-child(7) { background-color: lime; }
+.grid :nth-child(8) { background-color: lightblue; }
+.grid :nth-child(9) { background-color: darkred; }
+.grid :nth-child(10) { background-color: gold; }
+.grid :nth-child(11) { background-color: salmon; }
+
+.firstRowThirdColumn {
+    grid-row: 1;
+    grid-column: 3;
+}
+.firstRowFourthColumn {
+    grid-row: 1;
+    grid-column: 4;
+}
+.firstRowFifthColumn {
+    grid-row: 1;
+    grid-column: 5;
+}
+.grid > div {
+    min-width: 0px;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript"> setup({ explicit_done: true }); </script>
+
+<body onload="document.fonts.ready.then(() => { runTests(); })">
+
+<div class="grid" style="writing-mode: vertical-rl">
+    <div data-expected-width="20" data-offset-x="70" class="firstRowFirstColumn alignSelfBaseline" style="width: 20px;"></div>
+    <div data-expected-width="10" data-offset-x="70" class="firstRowSecondColumn alignSelfBaseline" style="width: 10px; margin: 0 20px 0 10px;"></div>
+    <div data-expected-width="10" data-offset-x="70" class="firstRowThirdColumn alignSelfBaseline" style="width: 10px; margin: 0 20px 0 0;"></div>
+    <div data-expected-width="100" data-offset-x="0" class="firstRowFourthColumn" style="width: 100px;"></div>
+</div>
+
+<div class="grid" style="writing-mode: vertical-rl">
+  <div id="baseline1" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+  <div id="baseline2" class="firstRowSecondColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px;"></div>
+  <div data-expected-width="50" data-offset-x="25" class="firstRowThirdColumn alignSelfCenter"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div id="baseline3" data-expected-width="50" class="firstRowFourthColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div data-expected-width="100" data-offset-x="0" class="firstRowFifthColumn" style="width: 100px;"></div>
+</div>
+
+<div class="grid" style="writing-mode: vertical-rl">
+  <div id="baseline4" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+  <div id="baseline5" class="firstRowSecondColumn alignSelfBaseline"><br><img src="/css/support/1x1-lime.png" style="width: 50px;"></div>
+  <div data-expected-width="50" data-offset-x="50" class="firstRowThirdColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div data-expected-width="100" data-offset-x="0" class="firstRowFourthColumn" style="width: 100px;"></div>
+</div>
+
+<div class="grid" style="writing-mode: vertical-lr">
+  <div id="baseline6" data-offset-x="13" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+  <div id="baseline7" data-offset-x="13" class="firstRowSecondColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px;"></div>
+  <div data-expected-width="50" data-offset-x="25" class="firstRowThirdColumn alignSelfCenter"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div data-expected-width="50" data-offset-x="0" class="firstRowFourthColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div data-expected-width="100" data-offset-x="0" class="firstRowFifthColumn" style="width: 100px;"></div>
+</div>
+
+<div class="grid" style="writing-mode: vertical-lr">
+  <div id="baseline8" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+  <div id="baseline9" class="firstRowSecondColumn alignSelfBaseline"><br><img src="/css/support/1x1-lime.png" style="width: 50px;"></div>
+  <div data-expected-width="50" data-offset-x="0" class="firstRowThirdColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="width: 50px; vertical-align: middle;"></div>
+  <div data-expected-width="100" data-offset-x="0" class="firstRowFourthColumn" style="width: 100px;"></div>
+</div>
+
+<div id="log"></div>
+
+</body>
+
+<script>
+
+  function runTests() {
+    var baseline1 = document.getElementById("baseline1");
+    var baseline2 = document.getElementById("baseline2");
+    var baseline3 = document.getElementById("baseline3");
+    var baseline4 = document.getElementById("baseline4");
+    var baseline5 = document.getElementById("baseline5");
+    var baseline6 = document.getElementById("baseline6");
+    var baseline7 = document.getElementById("baseline7");
+    var baseline8 = document.getElementById("baseline8");
+    var baseline9 = document.getElementById("baseline9");
+
+    checkLayout('.grid', false);
+
+    test(() => {assert_equals(baseline1.offsetLeft, baseline2.offsetLeft, "baseline1 and baseline2 should have the same baseline;")}, "Additional Check 1");
+    test(() => {assert_greater_than(baseline3.offsetLeft + baseline3.offsetWidth, 75, "baseline3 should be above the center align-itemsed item;")}, "Additional Check 2");
+    test(() => {assert_equals(baseline4.offsetLeft + baseline4.offsetWidth, baseline5.offsetLeft + baseline5.offsetWidth, "baseline4 and baseline5 should be right aligned with each other;")}, "Additional Check 3");
+    test(() => {assert_less_than(baseline4.offsetLeft + baseline4.offsetWidth, 100, "baseline4 and baseline5 should be below the dominant baseline;")}, "Additional Check 4");
+    test(() => {assert_equals(baseline6.offsetLeft, baseline7.offsetLeft, "baseline6 and baseline7 should have the same baseline;")}, "Additional Check 5");
+    test(() => {assert_equals(baseline8.offsetLeft, baseline9.offsetLeft, "baseline8 and baseline9 should be left aligned with each other;")}, "Additional Check 6");
+
+    done();
+  };
+
+</script>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html
new file mode 100644
index 00000000000..25744ce61e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid align baseline</title>
+<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#intro-baselines">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-rules">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-self">
+<meta name="assert" content="This test checks that baseline alignment works correctly for align-items and align-self properties">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+
+<style>
+
+.grid {
+    width: 600px;
+    grid-auto-columns: 1fr;
+    position: relative;
+    margin-bottom: 20px;
+    font: 20px/1 Ahem;
+}
+
+.grid :nth-child(1) { background-color: blue; }
+.grid :nth-child(2) { background-color: green; }
+.grid :nth-child(3) { background-color: red; }
+.grid :nth-child(4) { background-color: yellow; }
+.grid :nth-child(5) { background-color: purple; }
+.grid :nth-child(6) { background-color: orange; }
+.grid :nth-child(7) { background-color: lime; }
+.grid :nth-child(8) { background-color: lightblue; }
+.grid :nth-child(9) { background-color: darkred; }
+.grid :nth-child(10) { background-color: gold; }
+.grid :nth-child(11) { background-color: salmon; }
+
+.firstRowThirdColumn {
+    grid-row: 1;
+    grid-column: 3;
+}
+.firstRowFourthColumn {
+    grid-row: 1;
+    grid-column: 4;
+}
+.firstRowFifthColumn {
+    grid-row: 1;
+    grid-column: 5;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript"> setup({ explicit_done: true }); </script>
+
+<body onload="document.fonts.ready.then(() => { runTests(); })">
+
+<div class="grid alignItemsBaseline">
+    <div style="margin: 40px 0px;" class="firstRowFirstColumn" data-offset-x="0" data-offset-y="40" data-expected-width="200" data-expected-height="20"><div style="display:inline-block;"></div></div>
+    <div style="margin: auto 0px 0px;" class="firstRowSecondColumn" data-offset-x="200" data-offset-y="80" data-expected-width="200" data-expected-height="20"><div style="display:inline-block;"></div></div>
+    <div style="margin: 20px 0px;" class="firstRowThirdColumn" data-offset-x="400" data-offset-y="40" data-expected-width="200" data-expected-height="20"><div style="display:inline-block;"></div></div>
+</div>
+
+<div class="grid">
+    <div data-expected-height="20" data-offset-y="20" class="firstRowFirstColumn alignSelfBaseline" style="height: 20px;"></div>
+    <div data-expected-height="10" data-offset-y="30" class="firstRowSecondColumn alignSelfBaseline" style="height: 10px; margin: 30px 0 10px;"></div>
+    <div data-expected-height="10" data-offset-y="30" class="firstRowThirdColumn alignSelfBaseline" style="height: 10px; margin: 20px 0 0;"></div>
+    <div data-expected-height="100" data-offset-y="0" class="firstRowFourthColumn" style="height: 100px;"></div>
+</div>
+
+<div class="grid">
+    <div id="baseline1" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+    <div id="baseline2" data-offset-y="0" class="firstRowSecondColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="height: 50px;"></div>
+    <div data-expected-height="50" data-offset-y="25" class="firstRowThirdColumn alignSelfCenter"><img src="/css/support/1x1-lime.png" style="height: 50px; vertical-align: middle"></div>
+    <div id="baseline3" data-expected-height="50" class="firstRowFourthColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="height: 50px; vertical-align: middle"></div>
+    <div data-expected-height="100" data-offset-y="0" class="firstRowFifthColumn" style="height: 100px;"></div>
+</div>
+
+<div class="grid">
+    <div id="baseline4" class="firstRowFirstColumn alignSelfBaseline">ahem</div>
+    <div id="baseline5" class="firstRowSecondColumn alignSelfBaseline"><br><img src="/css/support/1x1-lime.png" style="height: 50px;"></div>
+    <div data-expected-height="50" data-offset-y="0" class="firstRowThirdColumn alignSelfBaseline"><img src="/css/support/1x1-lime.png" style="height: 50px; vertical-align: middle"></div>
+    <div data-expected-height="100" data-offset-y="0" class="firstRowFourthColumn" style="height: 100px;"></div>
+</div>
+
+<div id="log"></div>
+
+</body>
+
+<script>
+
+    function runTests() {
+      var baseline1 = document.getElementById("baseline1");
+      var baseline2 = document.getElementById("baseline2");
+      var baseline3 = document.getElementById("baseline3");
+      var baseline4 = document.getElementById("baseline4");
+      var baseline5 = document.getElementById("baseline5");
+
+      checkLayout('.grid', false);
+
+      test(() => {assert_equals(baseline1.offsetTop + baseline1.offsetHeight, baseline2.offsetTop + baseline2.offsetHeight, "baseline1 and baseline2 should have the same baseline;")},
+                  "Additional Check 1");
+      test(() => {assert_less_than(baseline3.offsetTop, 25, "baseline3 should be above the center align-selfed item;")}, "Additional Check 2");
+      test(() => {assert_equals(baseline4.offsetTop, baseline5.offsetTop, "baseline4 and baseline5 should be top aligned with each other;")}, "Additional Check 3");
+      test(() => {assert_greater_than(baseline4.offsetTop, 0, "baseline4 and baseline5 should be below the dominant baseline;")}, "Additional Check 4");
+
+      done();
+    };
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html
new file mode 100644
index 00000000000..51c7b18e949
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>CSS Grid Layout Test: Ignore auto-margins in the track sizing algorithm</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins"/>
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=776581"/>
+<link rel="match" href="../reference/grid-container-auto-margins-scrollbars-001-ref.html">
+<meta name="assert" content="This test ensures that the grid logic ignores any 'auto' margin during the track sizing algorithm. Previously resolved auto-margins should not affect the track sizing computation."/>
+<style>
+body {
+   display: grid;
+   grid-template-columns: auto;
+   grid-template-rows: 1fr auto;
+   height: 100vh;
+}
+.item1 {
+   margin: 0px auto;
+}
+.item2 {
+   background-color: cyan;
+   height: 50px;
+}
+</style>
+<div class="item1">item1</div>
+<div class="item2">item2</div>
+<script>
+    document.body.style = "overflow: hidden;";
+    document.body.offsetLeft;
+    document.body.style = "overflow: auto;";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-content-alignment-and-self-alignment-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html
similarity index 99%
rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-content-alignment-and-self-alignment-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html
index cd79210f10d..4c47ffdda90 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-content-alignment-and-self-alignment-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <title>CSS Grid Layout Test: content distribution alignment and self alignment.</title>
 <link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-justify-content">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-self-property">
-<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
 <link rel="stylesheet" href="/fonts/ahem.css">
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html
new file mode 100644
index 00000000000..68835c0461b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html
@@ -0,0 +1,561 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content distribution alignment and self alignment.</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-self-property">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=602670">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="Test that content distribution alignment works fine in combination with self alignment and items spanning more than one track." />
+
+<style>
+body {
+  margin: 0px;
+}
+
+.grid {
+  position: relative;
+}
+.spanningTwo {
+  grid-auto-columns: 20px;
+  grid-auto-rows: 40px;
+  grid-template-areas: "a a b"
+                       "c d b";
+  width: 300px;
+  height: 200px;
+}
+.spanningThree {
+  grid-auto-columns: 50px;
+  grid-auto-rows: 50px;
+  grid-template-areas: ". . . . . ."
+                       ". b b b c ."
+                       ". . . . c ."
+                       ". . . . c ."
+                       ". . . . . .";
+  width: 550px;
+  height: 450px;
+}
+
+.gridRowColumnGaps {
+  grid-row-gap: 20px;
+  grid-column-gap: 10px;
+}
+
+.i1 { grid-row: 1; }
+.i2 { grid-row: 2; }
+.i3 { grid-row: 3; grid-column: 6; }
+.i4 { grid-row: 4; grid-column: 6; }
+.i5 { grid-row: 5; grid-column: 6; }
+
+.a {
+  grid-area: a;
+  background-color: blue;
+}
+.b {
+  grid-area: b;
+  background-color: lime;
+}
+.c {
+  grid-area: c;
+  background-color: purple;
+}
+.d {
+  grid-area: d;
+  background-color: orange;
+}
+.stretchedGrid {
+  grid-auto-columns: minmax(20px, auto);
+  grid-auto-rows: minmax(40px, auto);
+}
+
+.cell {
+  width: 20px;
+  height: 40px;
+}
+.cell1 {
+  width: 20px;
+  height: 20px;
+}
+</style>
+</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceBetween" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="70" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="280" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceBetween" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-around' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceAround" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="240" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="40" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-around' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceAround" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="240" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="40" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-evenly' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceEvenly" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="100" data-offset-y="40" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="220" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="60" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-evenly' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceEvenly" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="40" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="220" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="60" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'stretch' | self-alignment: center</p>
+  <div class="grid spanningTwo stretchedGrid contentStretch" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter alignSelfCenter" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell justifySelfCenter alignSelfCenter" data-offset-x="240" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'stretch' | self-alignment: end</p>
+  <div class="grid spanningTwo stretchedGrid contentStretch" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd alignSelfEnd" data-offset-x="180" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell justifySelfEnd alignSelfEnd" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'default' | self-alignment: center</p>
+  <div class="grid spanningThree">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="115" data-offset-y="50" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="200" data-offset-y="115" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'default' | self-alignment: end</p>
+  <div class="grid spanningThree">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="180" data-offset-y="50" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="200" data-offset-y="180" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningThree contentSpaceBetween">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="215" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="400" data-offset-y="215" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningThree contentSpaceBetween">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="330" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="400" data-offset-y="330" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | rows/columns gap: 20px/40px | distribution: 'default' | self-alignment: center</p>
+  <div class="grid spanningThree gridRowColumnGaps">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="135" data-offset-y="70" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="240" data-offset-y="155" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | rows/columns gap: 20px/40px | distribution: 'default' | self-alignment: end</p>
+  <div class="grid spanningThree gridRowColumnGaps">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="210" data-offset-y="70" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="240" data-offset-y="240" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<!-- Same expected result than without gaps because space-between just use the remaining available space. -->
+<div style="position: relative">
+  <p>direction: LTR | rows/columns gap: 20px/40px | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningThree contentSpaceBetween gridRowColumnGaps">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="215" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="400" data-offset-y="215" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<!-- Same expected result than without gaps because space-between just use the remaining available space. -->
+<div style="position: relative">
+  <p>direction: LTR | rows/columns gap: 20px/40px | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningThree contentSpaceBetween gridRowColumnGaps">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="330" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="400" data-offset-y="330" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceBetween directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="210" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceBetween directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-around' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceAround directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="190" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="240" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-around' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceAround directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="40" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="240" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-evenly' | self-alignment: center</p>
+  <div class="grid spanningTwo contentSpaceEvenly directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter" data-offset-x="180" data-offset-y="40" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfCenter" data-offset-x="60" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="220" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-evenly' | self-alignment: end</p>
+  <div class="grid spanningTwo contentSpaceEvenly directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd" data-offset-x="140" data-offset-y="40" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell alignSelfEnd" data-offset-x="60" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="220" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'stretch' | self-alignment: center</p>
+  <div class="grid spanningTwo stretchedGrid contentStretch directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfCenter alignSelfCenter" data-offset-x="190" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell justifySelfCenter alignSelfCenter" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'stretch' | self-alignment: end</p>
+  <div class="grid spanningTwo stretchedGrid contentStretch directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a cell justifySelfEnd alignSelfEnd" data-offset-x="100" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
+    <div class="b cell justifySelfEnd alignSelfEnd" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="c" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'default' | self-alignment: center</p>
+  <div class="grid spanningThree directionRTL">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="415" data-offset-y="50" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="330" data-offset-y="115" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'default' | self-alignment: end</p>
+  <div class="grid spanningThree directionRTL">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="350" data-offset-y="50" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="330" data-offset-y="180" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningThree contentSpaceBetween directionRTL">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="315" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="130" data-offset-y="215" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningThree contentSpaceBetween directionRTL">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="200" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="130" data-offset-y="330" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | rows/columns gap: 20px/40px | distribution: 'default' | self-alignment: center</p>
+  <div class="grid spanningThree gridRowColumnGaps directionRTL">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="395" data-offset-y="70" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="290" data-offset-y="155" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | rows/columns gap: 20px/40px | distribution: 'default' | self-alignment: end</p>
+  <div class="grid spanningThree gridRowColumnGaps directionRTL">
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="320" data-offset-y="70" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="290" data-offset-y="240" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | rows/columns gap: 20px/40px | distribution: 'space-between' | self-alignment: center</p>
+  <div class="grid spanningThree contentSpaceBetween gridRowColumnGaps directionRTL">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfCenter" data-offset-x="315" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfCenter" data-offset-x="130" data-offset-y="215" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | rows/columns gap: 20px/40px | distribution: 'space-between' | self-alignment: end</p>
+  <div class="grid spanningThree contentSpaceBetween gridRowColumnGaps directionRTL">
+    <div class="i1" style="background: blue;"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i1" style="background: blue"></div>
+    <div class="i1" style="background: red"></div>
+    <div class="i2" style="background: red"></div>
+    <div class="i2" style="background: blue"></div>
+    <div class="b cell1 justifySelfEnd" data-offset-x="200" data-offset-y="100" data-expected-width="20" data-expected-height="20"></div>
+    <div class="c cell1 alignSelfEnd" data-offset-x="130" data-offset-y="330" data-expected-width="20" data-expected-height="20"></div>
+    <div class="i3" style="background: red"></div>
+    <div class="i4" style="background: blue"></div>
+    <div class="i5" style="background: red"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html
new file mode 100644
index 00000000000..32c3e3e4746
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content alignment and auto sized tracks.</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test that 'stretch' value for content alignment properties is applied only on 'auto-sized' tracks, which are the ones with an 'auto' max sizing function." />
+
+<style>
+body {
+  margin: 0px;
+}
+
+.grid {
+  display: grid;
+  background-color: grey;
+  position: relative;
+}
+
+.definiteSize {
+  width: 200px;
+  height: 300px;
+}
+
+.item {
+  width: 40px;
+  height: 80px;
+}
+
+.content {
+  width: 20px;
+  height: 40px;
+}
+
+.firstRowFirstColumn {
+  background-color: blue;
+  grid-column: 1;
+  grid-row: 1;
+}
+.firstRowSecondColumn {
+  background-color: lime;
+  grid-column: 2;
+  grid-row: 1;
+}
+.secondRowFirstColumn {
+  background-color: purple;
+  grid-column: 1;
+  grid-row: 2;
+}
+.secondRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: 2;
+}
+
+/* track sizes allowed to be stetched */
+.autoTracks { grid: auto auto / auto auto; }
+.autoMaxTracks { grid:  minmax(40px, auto) minmax(40px, auto) / minmax(20px, auto) minmax(20px, auto); }
+
+/* content-sized tracks disallowed to be stetched */
+.minContentTracks { grid: min-content min-content / min-content min-content; }
+.maxContentTracks { grid: max-content max-content / max-content max-content; }
+.minMaxWithMaxContentTracks { grid: minmax(20px, max-content) minmax(20px, max-content) / minmax(20px, max-content) minmax(20px, max-content); }
+.minMaxWithMinContentTracks { grid: minmax(20px, min-content) minmax(20px, min-content) / minmax(20px, min-content) minmax(20px, min-content); }
+.minMaxWithMinAutoTracks { grid: minmax(auto, max-content) minmax(auto, max-content) / minmax(auto, max-content) minmax(auto, max-content); }
+.fitContentTracks { grid: fit-content(20px) fit-content(20px) / fit-content(40px) fit-content(40px); font: 10px/1 Ahem; }
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+  setup({ explicit_done: true });
+</script>
+</head>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<div style="position: relative">
+  <p>cols: 'auto' | rows: 'auto' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize autoTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="150" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="100" data-offset-y="150" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'minmax(20px, auto)' | rows: 'minmax(40px, auto)' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize autoMaxTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="150" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="100" data-offset-y="150" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'min-content' | rows: 'min-content' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize minContentTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'max-content' | rows: 'max-content' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize maxContentTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'minmax(20px, max-content)' | rows: 'minmax(20px, max-content)' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize minMaxWithMaxContentTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'minmax(20px, min-content)' | rows: 'minmax(20px, min-content)' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize minMaxWithMinContentTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'minmax(auto, max-content)' | rows: 'minmax(auto, max-content)' | definite-sized container | definite-sized items </p>
+  <div class="grid contentStretch itemsStart definiteSize minMaxWithMinAutoTracks" data-expected-width="200" data-expected-height="300">
+    <div class="item firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+    <div class="item secondRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="40" data-expected-height="80"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>cols: 'fit-content(40px)' | rows: 'fit-content(20px)' | definite-sized container | content-sized items</p>
+  <div class="grid contentStretch itemsStart definiteSize fitContentTracks" data-expected-width="200" data-expected-height="300">
+    <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="20">X XX XX X</div>
+    <div class="firstRowSecondColumn" data-offset-x="40" data-offset-y="0" data-expected-width="40" data-expected-height="20">X XX XX X</div>
+    <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="20" data-expected-width="40" data-expected-height="20">X XX XX X</div>
+    <div class="secondRowSecondColumn" data-offset-x="40" data-offset-y="20" data-expected-width="40" data-expected-height="20">X XX XX X</div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html
new file mode 100644
index 00000000000..e3e33295837
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content alignment and overflow alignment.</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#overflow-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
+<meta name="assert" content="Test that the overflow alignment mode is applied correctly for content alignment properties." />
+
+<style>
+body {
+  margin: 0;
+}
+
+.container {
+  position: relative;
+  float: left;
+}
+
+.grid {
+  grid-template-columns: 50px 50px;
+  grid-template-rows: 100px 100px;
+}
+
+.contentSizedTracks {
+  grid-template:  max-content 100px / max-content 50px;
+}
+
+.overflowWidth {
+  width: 60px;
+  height: 300px;
+}
+
+.overflowHeight {
+  width: 200px;
+  height: 150px;
+}
+
+.item1 {
+  width: 50px;
+  height: 150px;
+}
+
+.item2 {
+  width: 150px;
+  height: 100px;
+}
+
+.minSize {
+  min-width: 300px;
+  min-height: 400px;
+}
+
+.maxSize {
+  max-width: 100px;
+  max-height: 100px;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+</head>
+
+<body onload="checkLayout('.grid')">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowWidth contentCenter" data-expected-width="60" data-expected-height="300">
+    <div class="firstRowFirstColumn" data-offset-x="-20" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="-20" data-offset-y="150" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="30" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="30" data-offset-y="150" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container width of 60px not enough for 2 column tracks of 50px.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>default</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowHeight contentCenterUnsafe" data-expected-width="200" data-expected-height="150">
+    <div class="firstRowFirstColumn" data-offset-x="50" data-offset-y="-25" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="75" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="-25" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="100" data-offset-y="75" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container height of 150px not enough for 2 row tracks of 100px.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowWidth contentCenterSafe" data-expected-width="60" data-expected-height="300">
+    <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="150" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container width of 60px not enough for 2 column tracks of 50px.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>safe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 75px; margin-right: 25px;">
+  <div class="grid overflowHeight contentCenterSafe" data-expected-width="200" data-expected-height="150">
+    <div class="firstRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="100" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container height of 150px not enough for 2 row tracks of 100px.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>safe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowWidth contentEnd" data-expected-width="60" data-expected-height="300">
+    <div class="firstRowFirstColumn" data-offset-x="-40" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="-40" data-offset-y="200" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="10" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="10" data-offset-y="200" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container width of 60px not enough for 2 column tracks of 50px.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>default</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowHeight contentEndUnsafe" data-expected-width="200" data-expected-height="150">
+    <div class="firstRowFirstColumn" data-offset-x="100" data-offset-y="-50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="-50" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="150" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container height of 150px not enough for 2 row tracks of 100px.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid overflowWidth contentEndSafe" data-expected-width="60" data-expected-height="300">
+    <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container width of 60px not enough for 2 column tracks of 50px.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>safe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 75px; margin-right: 25px;">
+  <div class="grid overflowHeight contentEndSafe" data-expected-width="200" data-expected-height="150">
+    <div class="firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="150" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container height of 150px not enough for 2 row tracks of 100px.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>safe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid fit-content contentEndUnsafe" data-expected-width="100" data-expected-height="200">
+    <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, hence no possible overflow.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 200px; margin-right: 25px;">
+  <div class="grid fit-content contentCenterUnsafe" data-expected-width="100" data-expected-height="200">
+    <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+    <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+    <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="100" data-expected-width="50" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, hence no possible overflow.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 100px; margin-right: 25px;">
+  <div class="grid contentSizedTracks fit-content maxSize contentEndUnsafe" data-expected-width="100" data-expected-height="100">
+    <div class="item1 firstRowSecondColumn" data-offset-x="50" data-offset-y="-150" data-expected-width="50" data-expected-height="150"></div>
+    <div class="item2 secondRowFirstColumn" data-offset-x="-100" data-offset-y="0" data-expected-width="150" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, but max-size constraints implies that the content-sized tracks overflow.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 100px; margin-right: 75px;">
+  <div class="grid contentSizedTracks fit-content maxSize contentCenterUnsafe" data-expected-width="100" data-expected-height="100">
+    <div class="item1 firstRowSecondColumn" data-offset-x="100" data-offset-y="-75" data-expected-width="50" data-expected-height="150"></div>
+    <div class="item2 secondRowFirstColumn" data-offset-x="-50" data-offset-y="75" data-expected-width="150" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, but max-size constraints implies that the content-sized tracks overflow.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-bottom: 50px; margin-right: 25px;">
+  <div class="grid contentSizedTracks fit-content minSize contentEndUnsafe" data-expected-width="300" data-expected-height="400">
+    <div class="item1 firstRowSecondColumn" data-offset-x="250" data-offset-y="150" data-expected-width="50" data-expected-height="150"></div>
+    <div class="item2 secondRowFirstColumn" data-offset-x="100" data-offset-y="300" data-expected-width="150" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, but min-size constraints implies that the content-sized tracks don't overflow.<br> Content-Alignment: <b>end</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+<div class="container" style="margin-right: 25px;">
+  <div class="grid contentSizedTracks fit-content minSize contentCenterUnsafe" data-expected-width="300" data-expected-height="400">
+    <div class="item1 firstRowSecondColumn" data-offset-x="200" data-offset-y="75" data-expected-width="50" data-expected-height="150"></div>
+    <div class="item2 secondRowFirstColumn" data-offset-x="50" data-offset-y="225" data-expected-width="150" data-expected-height="100"></div>
+  </div>
+</div>
+<div>Grid container indefinite size using fit-content, but min-size constraints implies that the content-sized tracks don't overflow.<br> Content-Alignment: <b>center</b> and Overflow-Alignment: <b>unsafe</b></div>
+
+<br clear="all">
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html
new file mode 100644
index 00000000000..6333c13b00b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content alignment and items spanning multiple tracks.</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-content">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-content">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test that content distribution alignment is applied correctly when items span more than one track." />
+
+<style>
+body {
+  margin: 0px;
+}
+
+.grid {
+  grid-auto-columns: 20px;
+  grid-auto-rows: 40px;
+  grid-template-areas: "a a b"
+                       "c d b";
+  position: relative;
+  width: 300px;
+  height: 200px;
+}
+.a {
+  grid-area: a;
+  background-color: blue;
+}
+.b {
+  grid-area: b;
+  background-color: lime;
+}
+.c {
+  grid-area: c;
+  background-color: purple;
+}
+.d {
+  grid-area: d;
+  background-color: orange;
+}
+.stretchedGrid {
+  grid-auto-columns: auto;
+  grid-auto-rows: auto;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+</head>
+
+<body onload="checkLayout('.grid')">
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="160" data-expected-height="40"></div>
+    <div class="b" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="200"></div>
+    <div class="c" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="40" data-offset-y="30" data-expected-width="120" data-expected-height="40"></div>
+    <div class="b" data-offset-x="240" data-offset-y="30" data-expected-width="20" data-expected-height="140"></div>
+    <div class="c" data-offset-x="40" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-evenly'</p>
+  <div class="grid contentSpaceEvenly" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="60" data-offset-y="40" data-expected-width="100" data-expected-height="40"></div>
+    <div class="b" data-offset-x="220" data-offset-y="40" data-expected-width="20" data-expected-height="120"></div>
+    <div class="c" data-offset-x="60" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
+    <div class="b" data-offset-x="200" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
+    <div class="c" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="140" data-offset-y="0" data-expected-width="160" data-expected-height="40"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="200"></div>
+    <div class="c" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="140" data-offset-y="30" data-expected-width="120" data-expected-height="40"></div>
+    <div class="b" data-offset-x="40" data-offset-y="30" data-expected-width="20" data-expected-height="140"></div>
+    <div class="c" data-offset-x="240" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-evenly''</p>
+  <div class="grid contentSpaceEvenly directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="140" data-offset-y="40" data-expected-width="100" data-expected-height="40"></div>
+    <div class="b" data-offset-x="60" data-offset-y="40" data-expected-width="20" data-expected-height="120"></div>
+    <div class="c" data-offset-x="220" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+    <div class="d" data-offset-x="140" data-offset-y="120" data-expected-width="20" data-expected-height="40"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch directionRTL" data-expected-width="300" data-expected-height="200">
+    <div class="a" data-offset-x="100" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
+    <div class="c" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html
new file mode 100644
index 00000000000..d1b256bc0ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content alignment and items spanning multiple tracks (vertical-lr).</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-content">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-content">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test that content distribution alignment is applied correctly when items span more than one track with 'writing-mode: vertical-lr'." />
+
+<style>
+body {
+  margin: 0px;
+}
+
+.grid {
+  grid-auto-columns: 20px;
+  grid-auto-rows: 40px;
+  grid-template-areas: "a a b"
+                       "c d b";
+  position: relative;
+  width: 200px;
+  height: 300px;
+}
+.a {
+  grid-area: a;
+  background-color: blue;
+}
+.b {
+  grid-area: b;
+  background-color: lime;
+}
+.c {
+  grid-area: c;
+  background-color: purple;
+}
+.d {
+  grid-area: d;
+  background-color: orange;
+}
+.stretchedGrid {
+  grid-auto-columns: auto;
+  grid-auto-rows: auto;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+</head>
+
+<body onload="checkLayout('.grid')">
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween verticalLR" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="160"></div>
+    <div class="b" data-offset-x="0" data-offset-y="280" data-expected-width="200" data-expected-height="20"></div>
+    <div class="c" data-offset-x="160" data-offset-y="0" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="160" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround verticalLR" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="30" data-offset-y="40" data-expected-width="40" data-expected-height="120"></div>
+    <div class="b" data-offset-x="30" data-offset-y="240" data-expected-width="140" data-expected-height="20"></div>
+    <div class="c" data-offset-x="130" data-offset-y="40" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="130" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-evenly'</p>
+  <div class="grid contentSpaceEvenly verticalLR" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="40" data-offset-y="60" data-expected-width="40" data-expected-height="100"></div>
+    <div class="b" data-offset-x="40" data-offset-y="220" data-expected-width="120" data-expected-height="20"></div>
+    <div class="c" data-offset-x="120" data-offset-y="60" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="120" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch verticalLR" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
+    <div class="b" data-offset-x="0" data-offset-y="200" data-expected-width="200" data-expected-height="100"></div>
+    <div class="c" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween verticalLR directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="0" data-offset-y="140" data-expected-width="40" data-expected-height="160"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="20"></div>
+    <div class="c" data-offset-x="160" data-offset-y="280" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="160" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround verticalLR directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="30" data-offset-y="140" data-expected-width="40" data-expected-height="120"></div>
+    <div class="b" data-offset-x="30" data-offset-y="40" data-expected-width="140" data-expected-height="20"></div>
+    <div class="c" data-offset-x="130" data-offset-y="240" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="130" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-evenly'</p>
+  <div class="grid contentSpaceEvenly verticalLR directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="40" data-offset-y="140" data-expected-width="40" data-expected-height="100"></div>
+    <div class="b" data-offset-x="40" data-offset-y="60" data-expected-width="120" data-expected-height="20"></div>
+    <div class="c" data-offset-x="120" data-offset-y="220" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="120" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch verticalLR directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="200"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
+    <div class="c" data-offset-x="100" data-offset-y="200" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html
new file mode 100644
index 00000000000..f3102a82b79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: content alignment and items spanning multiple tracks (vertical-rl).</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#distribution-values">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-content">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-content">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=376823">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=249451">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test that content distribution alignment is applied correctly when items span more than one track with 'writing-mode: vertical-rl'." />
+
+<style>
+body {
+  margin: 0px;
+}
+
+.grid {
+  grid-auto-columns: 20px;
+  grid-auto-rows: 40px;
+  grid-template-areas: "a a b"
+                       "c d b";
+  position: relative;
+  width: 200px;
+  height: 300px;
+}
+.a {
+  grid-area: a;
+  background-color: blue;
+}
+.b {
+  grid-area: b;
+  background-color: lime;
+}
+.c {
+  grid-area: c;
+  background-color: purple;
+}
+.d {
+  grid-area: d;
+  background-color: orange;
+}
+.stretchedGrid {
+  grid-auto-columns: auto;
+  grid-auto-rows: auto;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+</head>
+
+<body onload="checkLayout('.grid')">
+
+<p>This test checks that Content Distribution alignment is applied correctly when items span more than one track.</p>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween verticalRL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="160" data-offset-y="0" data-expected-width="40" data-expected-height="160"></div>
+    <div class="b" data-offset-x="0" data-offset-y="280" data-expected-width="200" data-expected-height="20"></div>
+    <div class="c" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="0" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround verticalRL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="130" data-offset-y="40" data-expected-width="40" data-expected-height="120"></div>
+    <div class="b" data-offset-x="30" data-offset-y="240" data-expected-width="140" data-expected-height="20"></div>
+    <div class="c" data-offset-x="30" data-offset-y="40" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="30" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'space-evenly'</p>
+  <div class="grid contentSpaceEvenly verticalRL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="120" data-offset-y="60" data-expected-width="40" data-expected-height="100"></div>
+    <div class="b" data-offset-x="40" data-offset-y="220" data-expected-width="120" data-expected-height="20"></div>
+    <div class="c" data-offset-x="40" data-offset-y="60" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="40" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: LTR | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch verticalRL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
+    <div class="b" data-offset-x="0" data-offset-y="200" data-expected-width="200" data-expected-height="100"></div>
+    <div class="c" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-between'</p>
+  <div class="grid contentSpaceBetween verticalRL directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="160" data-offset-y="140" data-expected-width="40" data-expected-height="160"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="20"></div>
+    <div class="c" data-offset-x="0" data-offset-y="280" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="0" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-around'</p>
+  <div class="grid contentSpaceAround verticalRL directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="130" data-offset-y="140" data-expected-width="40" data-expected-height="120"></div>
+    <div class="b" data-offset-x="30" data-offset-y="40" data-expected-width="140" data-expected-height="20"></div>
+    <div class="c" data-offset-x="30" data-offset-y="240" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="30" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'space-evenly'</p>
+  <div class="grid contentSpaceEvenly verticalRL directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="120" data-offset-y="140" data-expected-width="40" data-expected-height="100"></div>
+    <div class="b" data-offset-x="40" data-offset-y="60" data-expected-width="120" data-expected-height="20"></div>
+    <div class="c" data-offset-x="40" data-offset-y="220" data-expected-width="40" data-expected-height="20"></div>
+    <div class="d" data-offset-x="40" data-offset-y="140" data-expected-width="40" data-expected-height="20"></div>
+  </div>
+</div>
+
+<div style="position: relative">
+  <p>direction: RTL | distribution: 'stretch'</p>
+  <div class="grid stretchedGrid contentStretch verticalRL directionRTL" data-expected-width="200" data-expected-height="300">
+    <div class="a" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="200"></div>
+    <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
+    <div class="c" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="100"></div>
+    <div class="d" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html
new file mode 100644
index 00000000000..6aff5895953
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid: grid container's size includes border, padding and scrollbar.</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid/#intrinsic-sizes"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#overflow"/>
+<meta name="assert" content="This test checks that grid container size includes border, padding and scrollbar; ignoring margin as expected."/>
+<link rel="issue" href="https://crbug.com/532032"/>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<link href="/css/support/width-keyword-classes.css" rel="stylesheet">
+<link href="/css/support/height-keyword-classes.css" rel="stylesheet">
+<style>
+.margin {
+    margin: 10px;
+}
+
+.border {
+    border: 5px solid black;
+}
+
+.padding {
+    padding: 20px;
+}
+
+.scroll {
+    overflow: scroll;
+}
+
+.item {
+    width: 100px;
+    height: 100px;
+    background: lime;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+</head>
+<body onload="checkLayout('.grid');">
+    <div class="grid min-content" data-expected-width="100" data-expected-height="100">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin" data-expected-width="100" data-expected-height="100">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content border" data-expected-width="110" data-expected-height="110">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content padding" data-expected-width="140" data-expected-height="140">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content scroll" data-expected-width="115" data-expected-height="115">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin border" data-expected-width="110" data-expected-height="110">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin padding" data-expected-width="140" data-expected-height="140">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin scroll" data-expected-width="115" data-expected-height="115">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content border padding" data-expected-width="150" data-expected-height="150">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content border scroll" data-expected-width="125" data-expected-height="125">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content padding scroll" data-expected-width="155" data-expected-height="155">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin border padding" data-expected-width="150" data-expected-height="150">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin border scroll" data-expected-width="125" data-expected-height="125">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin padding scroll" data-expected-width="155" data-expected-height="155">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content border padding scroll" data-expected-width="165" data-expected-height="165">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+
+    <div class="grid min-content margin border padding scroll" data-expected-width="165" data-expected-height="165">
+        <div class="item" data-expected-width="100" data-expected-height="100"></div>
+    </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html
new file mode 100644
index 00000000000..43b62a9316b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>CSS Grid Layout Test: Grid container's height with scrollbars</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#overflow"/>
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=583743"/>
+<link rel="match" href="../reference/grid-container-scrollbars-sizing-001-ref.html">
+<meta name="assert" content="This test ensures that the grid container considers the scrollbar when computing the logical height."/>
+<style>
+html {
+  overflow-x: scroll;
+}
+.grid {
+  display: grid;
+  float: left;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+.item {
+  background: lime;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<p>This test passes if you see a 100x100px green box and scrollbars are disabled.</p>
+<div class="grid">
+    <div class="item">item</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html
new file mode 100644
index 00000000000..2a849df25ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid Layout Test: 'float' and 'clear' have no effect on a grid item.</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-containers"/>
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=79180"/>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<link href="/css/support/alignment.css" rel="stylesheet"/>
+<meta name="assert" content="This test ensures that the grid's items are not affected by the 'float' and 'clear' properties."/>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+.container {
+  background-color:grey;
+}
+
+.gridItem {
+  width: 50px;
+  height: 50px;
+}
+</style>
+<body onload="checkLayout('.container')">
+
+<div style="position: relative">
+  <div class="container grid justifyContentStart">
+    <div style="float: right;" class="gridItem firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+    <div class="gridItem firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+    <div style="float: left;" class="gridItem firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+    <div style="float: left;" class="gridItem secondRowFirstColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="50"></div>
+    <div style="clear: both;" class="gridItem secondRowFirstColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="50"></div>
+    <div style="float: left;" class="gridItem secondRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="50" data-expected-height="50"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html
new file mode 100644
index 00000000000..99b04e062f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<title>CSS Grid: grid gutters and flex content.</title>
+<link rel="author" title="Sergio Villar" href="mailto:svillar@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters"/>
+<meta name="assert" content="Check that gutters do not interfere with flex content resolution for columns or with content sized tracks."/>
+<link rel="stylesheet" href="/css/support/grid.css"/>
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css"/>
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css"/>
+<style>
+.gridPercentAndFlexContent { grid-template: 50px / 50% minmax(30px, 2fr); }
+.gridTwoDoubleMaxFlexContent { grid-template: 50px / minmax(10px, 0.5fr) minmax(10px, 2fr); }
+.gridIgnoreSecondGridItem { grid-template: 50px / minmax(300px, 3fr) minmax(150px, 1fr); }
+
+.gridRowsPercentAndFlexContent { grid-template: minmax(30px, 2fr) 50% / 50px; }
+.gridRowsTwoMaxFlexContent { grid-template: minmax(10px, 1fr) minmax(10px, 2fr) / 50px; }
+.gridRowsTwoDoubleMaxFlexContent { grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
+
+.gridMinContentAndMinMaxFixedMinContentAndFlex { grid-template-columns: min-content minmax(20px, min-content) 2fr; }
+.gridMaxContentAndMinMaxFixedMaxContentAndFlex { grid-template-columns: max-content minmax(20px, max-content) 1fr; }
+
+div.grid > div { font: 10px/1 Ahem; }
+
+.gridRowColumnGaps {
+    grid-row-gap: 33px;
+    grid-column-gap: 19px;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+    setup({ explicit_done: true });
+</script>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<!-- Check that gutters do not interfere with flex content resolution for columns -->
+
+<div style="width: 120px; height: 10px;">
+    <div class="grid gridTwoDoubleMaxFlexContent gridRowColumnGaps" data-expected-width="120" data-expected-height="50">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="20" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="81" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="width: 570px; height: 10px;">
+    <div class="grid gridIgnoreSecondGridItem gridRowColumnGaps" data-expected-width="570" data-expected-height="50">
+        <div class="firstRowFirstColumn" data-expected-width="401" data-expected-height="50"></div>
+        <div class="firstRowSecondColumn" data-expected-width="150" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="width: 120px; height: 10px;">
+    <div class="grid gridPercentAndFlexContent gridRowColumnGaps" data-expected-width="120" data-expected-height="50">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="60" data-expected-height="50"></div>
+        <div class="firstRowSecondColumn" data-expected-width="41" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Check that gutters do not interfere with flex content resolution for rows -->
+
+<div style="width: 10px; height: 60px">
+    <div class="grid gridRowsTwoMaxFlexContent gridRowColumnGaps" style="height: 100%" data-expected-width="10" data-expected-height="60">
+        <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="secondRowFirstColumn" data-expected-width="50" data-expected-height="17"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 60px">
+    <div class="grid gridRowsTwoDoubleMaxFlexContent gridRowColumnGaps" data-expected-width="10" data-expected-height="63">
+        <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div style="width: 10px;">
+    <div class="grid gridRowsPercentAndFlexContent gridRowColumnGaps" style="height: 150px" data-expected-width="10" data-expected-height="150">
+        <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="42"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="75"></div>
+    </div>
+</div>
+
+<!-- Check that gutters do not interfere with flex content resolution with content sized tracks -->
+
+<div style="position: relative; width: 100px;">
+    <div class="grid gridMinContentAndMinMaxFixedMinContentAndFlex gridRowColumnGaps" data-expected-width="100" data-expected-height="149">
+    <div style="grid-column: 2 / span 2;" data-expected-width="80">XXXXX</div>
+    <div style="grid-column: 1 / -1; grid-row: 2;" data-expected-width="100">XXX XXX XXX</div>
+    <div style="grid-column: 1 / span 2; grid-row: 3;" data-expected-width="40">XXXX XXXX</div>
+        <div style="grid-column: 1; grid-row: 4;" data-expected-width="1" data-expected-height="0"></div>
+    </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+    <div class="grid gridMaxContentAndMinMaxFixedMaxContentAndFlex gridRowColumnGaps" data-expected-width="100" data-expected-height="139">
+    <div style="grid-column: 2 / span 2;" data-expected-width="39">XX</div>
+    <div style="grid-column: 1 / -1; grid-row: 2;" data-expected-width="109">XXX XXX XXX</div>
+    <div style="grid-column: 1 / span 2; grid-row: 3;" data-expected-width="90">XXXX XXXX</div>
+        <div style="grid-column: 1; grid-row: 4;" data-expected-width="51" data-expected-height="0"></div>
+    </div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html
new file mode 100644
index 00000000000..ebf914dbe98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<title>CSS Grid: grid gutters and tracks.</title>
+<link rel="author" title="Sergio Villar" href="mailto:svillar@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters"/>
+<meta name="assert" content="Check that gutters contribute to the size of the grid containers and spanning items, and do not alter grid items positioning, margin computation and track sizing."/>
+<link rel="stylesheet" href="/css/support/grid.css"/>
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css"/>
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css"/>
+<style>
+body { margin: 0px; }
+
+.normalGap { grid-gap: normal; }
+
+.gridGap { grid-gap: 16px; }
+
+.gridRowColumnGaps {
+    grid-row-gap: 12px;
+    grid-column-gap: 23px;
+}
+
+.gridMultipleCols { grid-template-columns: 30px minmax(10px, 50px) 80px; }
+.gridMultipleRows { grid-template-rows: 90px 70px min-content; }
+.gridAutoAuto { grid-template: auto auto / auto auto; }
+.gridMultipleFixed { grid-template: [first] 37px [foo] 57px [bar] 77px [last] / [first] 15px [foo] 25px [bar] 35px [last]; }
+.gridFixed100 { grid-template: repeat(2, 100px) / repeat(2, 100px); }
+.gridWithPercent { grid-template-columns: 10px 20% repeat(2, 30px); }
+.gridWithDoublePercent { grid-template-columns: 60% 40%; }
+.gridWithRowPercent { grid-template: 10px 20% 30px / 20px; }
+.gridWithRowDoublePercent { grid-template: 60% 40% / 20px; }
+
+.width220 { width: 220px; }
+.height100 { height: 100px; }
+.gridAutoRows20 { grid-auto-rows: 20px; }
+
+.thirdRowThirdColumn { grid-area: 3 / 3; }
+.firstRowThirdColumn { grid-area: 1 / 3; }
+
+div.grid > div { font: 10px/1 Ahem; }
+
+.gridItemMargins {
+    margin: 20px 30px 40px 50px;
+    width: 20px;
+    height: 40px;
+}
+
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+    setup({ explicit_done: true });
+</script>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<!-- Check that gutters contribute to the size of the grid containers. -->
+
+<div style="position: relative;">
+    <div class="grid normalGap gridMultipleCols fit-content" data-expected-width="160" data-expected-height="0"></div>
+    <div class="grid normalGap gridMultipleRows" style="width: 400px" data-expected-width="400" data-expected-height="160"></div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridRowColumnGaps fit-content" data-expected-width="93" data-expected-height="52">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">XX</div>
+        <div class="secondRowSecondColumn" data-offset-x="43" data-offset-y="22" data-expected-width="50" data-expected-height="30">XX<br>X<br>XX XX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridMultipleCols gridRowColumnGaps fit-content" data-expected-width="206" data-expected-height="84">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="10">XX</div>
+        <div class="secondRowSecondColumn" data-offset-x="53" data-offset-y="22" data-expected-width="50" data-expected-height="20">XX<br>XX XX</div>
+        <div class="thirdRowThirdColumn" data-offset-x="126" data-offset-y="54" data-expected-width="80" data-expected-height="30">XXXX XX<br>X<br>XX XX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridMultipleRows gridRowColumnGaps fit-content" data-expected-width="186" data-expected-height="214">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="90">XX</div>
+        <div class="secondRowSecondColumn" data-offset-x="43" data-offset-y="102" data-expected-width="50" data-expected-height="70">XX<br>XX XX</div>
+        <div class="thirdRowThirdColumn" data-offset-x="116" data-offset-y="184" data-expected-width="70" data-expected-height="30">XXXX XX<br>X<br>XX XX</div>
+    </div>
+</div>
+
+<!-- Check that gutters do not alter grid items positioning. -->
+<div style="position: relative">
+    <div class="grid gridMultipleFixed gridRowColumnGaps">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="37">X X X</div>
+        <div class="secondRowSecondColumn" data-offset-x="38" data-offset-y="49" data-expected-width="25" data-expected-height="57">X X</div>
+        <div class="thirdRowThirdColumn" data-offset-x="86" data-offset-y="118" data-expected-width="35" data-expected-height="77">XXX XX X XX XX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridMultipleFixed gridRowColumnGaps">
+        <div style="grid-row: 2; grid-column: -2 / -1;" data-offset-x="86" data-offset-y="49" data-expected-width="35" data-expected-height="57">X X X</div>
+        <div style="grid-row: 1 / bar; grid-column: bar" data-offset-x="86" data-offset-y="0" data-expected-width="35" data-expected-height="106">X XX X XX XX XX X</div>
+        <div style="grid-row: -2; grid-column-end: foo" data-offset-x="0" data-offset-y="118" data-expected-width="15" data-expected-height="77">X X</div>
+    </div>
+</div>
+
+<!-- Check that gutters do not alter track sizing. -->
+<div style="position: relative">
+    <div class="grid gridRowColumnGaps fit-content" data-expected-width="156" data-expected-height="84">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">XX</div>
+        <div class="secondRowSecondColumn" data-offset-x="43" data-offset-y="22" data-expected-width="30" data-expected-height="20">X X<br>X X</div>
+        <div class="thirdRowThirdColumn" data-offset-x="96" data-offset-y="54" data-expected-width="60" data-expected-height="30">XXX XX<br>X<br>XX XX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridRowColumnGaps gridMultipleCols gridMultipleRows fit-content" data-expected-width="206" data-expected-height="214">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="90">XX</div>
+        <div class="secondRowSecondColumn" data-offset-x="53" data-offset-y="102" data-expected-width="50" data-expected-height="70">X X<br>X X</div>
+        <div class="thirdRowThirdColumn" data-offset-x="126" data-offset-y="184" data-expected-width="80" data-expected-height="30">XXX XX<br>X<br>XX XX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridWithPercent width220 gridRowColumnGaps gridAutoRows20" data-expected-width="220" data-expected-height="84">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="20"></div>
+        <div class="secondRowSecondColumn" data-offset-x="33" data-offset-y="32" data-expected-width="44" data-expected-height="20"></div>
+        <div class="thirdRowThirdColumn" data-offset-x="100" data-offset-y="64" data-expected-width="30" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridWithRowPercent gridRowColumnGaps width220 height100" data-expected-width="220" data-expected-height="100">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10"></div>
+        <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="22" data-expected-width="20" data-expected-height="20"></div>
+        <div class="thirdRowAutoColumn" data-offset-x="0" data-offset-y="54" data-expected-width="20" data-expected-height="30"></div>
+    </div>
+</div>
+
+<!-- Check that gutters contribute to the size of spanning items. -->
+<div style="position: relative">
+    <div class="grid gridGap gridAutoAuto constrainedContainer">
+        <div class="secondRowBothColumn" data-offset-x="0" data-offset-y="26" data-expected-width="50" data-expected-height="10">XXXXX</div>
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="17" data-expected-height="10">X</div>
+        <div class="firstRowSecondColumn" data-offset-x="33" data-offset-y="0" data-expected-width="17" data-expected-height="10">X</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridMultipleFixed gridRowColumnGaps">
+        <div style="grid-row: 2; grid-column: 1 / -1;" data-offset-x="0" data-offset-y="49" data-expected-width="121" data-expected-height="57">XXXX X XXXX</div>
+        <div style="grid-row: first / last; grid-column-start: 2" data-offset-x="38" data-offset-y="0" data-expected-width="25" data-expected-height="195">X XX X XX X</div>
+        <div style="grid-row: 1 / 3; grid-column: first / bar" data-offset-x="0" data-offset-y="0" data-expected-width="63" data-expected-height="106">XXX XX<br>XX<br>XXXXX</div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridWithDoublePercent width220 gridRowColumnGaps gridAutoRows20" data-expected-width="220" data-expected-height="52">
+        <div class="firstRowFirstColumn sizedToGridArea" data-offset-x="0" data-offset-y="0" data-expected-width="132" data-expected-height="20"></div>
+        <div class="secondRowSecondColumn sizedToGridArea" data-offset-x="155" data-offset-y="32" data-expected-width="88" data-expected-height="20"></div>
+        <div class="secondRowBothColumn sizedToGridArea" data-offset-x="0" data-offset-y="32" data-expected-width="243" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridWithRowDoublePercent gridRowColumnGaps width220 height100" data-expected-width="220" data-expected-height="100">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="60"></div>
+        <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="72" data-expected-width="20" data-expected-height="40"></div>
+        <div class="bothRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="112"></div>
+    </div>
+</div>
+
+<!-- Check that gutters do not interfere with margins computation. -->
+<div style="position: relative">
+    <div class="grid gridFixed100 gridGap">
+        <div class="gridItemMargins firstRowFirstColumn" data-offset-x="50" data-offset-y="20" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins firstRowSecondColumn" data-offset-x="166" data-offset-y="20" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins secondRowFirstColumn" data-offset-x="50" data-offset-y="136" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins secondRowSecondColumn" data-offset-x="166" data-offset-y="136" data-expected-width="20" data-expected-height="40"></div>
+    </div>
+</div>
+
+<div style="position: relative">
+    <div class="grid gridFixed100 verticalRL directionRTL gridGap">
+        <div class="gridItemMargins firstRowFirstColumn" data-offset-x="166" data-offset-y="136" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins firstRowSecondColumn" data-offset-x="166" data-offset-y="20" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins secondRowFirstColumn" data-offset-x="50" data-offset-y="136" data-expected-width="20" data-expected-height="40"></div>
+        <div class="gridItemMargins secondRowSecondColumn" data-offset-x="50" data-offset-y="20" data-expected-width="20" data-expected-height="40"></div>
+    </div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html
new file mode 100644
index 00000000000..28950e4973c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid: min-height and max-height</title>
+<link rel="author" title="Julien Chaffraix" href="mailto:jchaffraix@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#intrinsic-sizes">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="This test checks that min-height and max-height are accounted for when computing the grid container's height.">
+<style>
+.minHeightGrid {
+    min-height: 100px;
+    grid-template-columns: 40px;
+    grid-template-rows: 50px;
+}
+.maxHeightGrid {
+    max-height: 100px;
+    grid-template-columns: 40px;
+    grid-template-rows: 150px 50px;
+}
+
+.minHeightAutoGrid {
+    min-height: 100px;
+}
+
+.maxHeightAutoGrid {
+    max-height: 100px;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.grid')">
+
+<div class="constrainedContainer">
+    <div class="grid minHeightGrid" data-expected-height="100" data-expected-width="10"></div>
+    <div class="grid maxHeightGrid" data-expected-height="100" data-expected-width="10"></div>
+    <div class="grid minHeightAutoGrid" data-expected-height="100" data-expected-width="10"></div>
+    <div class="grid maxHeightAutoGrid" data-expected-height="0" data-expected-width="10"></div>
+
+    <div class="grid minHeightAutoGrid" data-expected-height="150" data-expected-width="10">
+        <div style="height: 150px"></div>
+    </div>
+    <div class="grid maxHeightAutoGrid" data-expected-height="100" data-expected-width="10">
+        <div style="height: 300px"></div>
+    </div>
+</div>
+
+<div class="unconstrainedContainer">
+    <div class="grid minHeightGrid" data-expected-height="100" data-expected-width="1000"></div>
+    <div class="grid maxHeightGrid" data-expected-height="100" data-expected-width="1000"></div>
+    <div class="grid minHeightAutoGrid" data-expected-height="100" data-expected-width="1000"></div>
+    <div class="grid maxHeightAutoGrid" data-expected-height="0" data-expected-width="1000"></div>
+
+    <div class="grid minHeightAutoGrid" data-expected-height="150" data-expected-width="1000">
+        <div style="height: 150px"></div>
+    </div>
+    <div class="grid maxHeightAutoGrid" data-expected-height="100" data-expected-width="1000">
+        <div style="height: 300px"></div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html
new file mode 100644
index 00000000000..4209af55fea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid: shrink-to-fit behavior on grid containers</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.org">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#intrinsic-sizes">
+<link rel="help" href="https://crbug.com/234204">
+<meta name="assert" content="This test checks that the shrink-to-fit behavior is applied to the float and out-of-flow positioned grid containers.">
+<style>
+.grid {
+    display: grid;
+    grid-template-columns: 200px 200px;
+    grid-template-rows: 200px 200px;
+}
+.container {
+    width: 600px;
+    height: 600px;
+}
+
+#absolutePos {
+   position: absolute;
+}
+
+#fixedPos {
+   position: fixed;
+}
+
+#floatPos {
+   float: left;
+}
+
+#one {
+    color: blue;
+    background: red;
+    grid-column: 1;
+    grid-row: 1;
+}
+
+#two {
+    color: yellow;
+    background: green;
+    grid-column: 2;
+    grid-row: 1;
+}
+#three {
+    color: gray;
+    background: pink;
+    grid-column: 1;
+    grid-row: 2;
+}
+#four {
+    color: orange;
+    background: brown;
+    grid-column: 2;
+    grid-row: 2;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.grid')">
+
+<p>The following grids should be 400px * 400px, except the first one which uses 'relative' positioning.</p>
+
+<div class="container">
+    <div class="grid" id="regularGrid" data-expected-height="400" data-expected-width="600">
+        <div id="one"></div>
+        <div id="two"></div>
+        <div id="three"></div>
+        <div id="four"></div>
+    </div>
+</div>
+
+<div class="container">
+    <div class="grid" id="absolutePos" data-expected-height="400" data-expected-width="400">
+        <div id="one"></div>
+        <div id="two"></div>
+        <div id="three"></div>
+        <div id="four"></div>
+    </div>
+</div>
+
+<div class="container">
+    <div class="grid" id="fixedPos" data-expected-height="400" data-expected-width="400">
+        <div id="one"></div>
+        <div id="two"></div>
+        <div id="three"></div>
+        <div id="four"></div>
+    </div>
+</div>
+
+<div class="container">
+    <div class="grid" id="floatPos" data-expected-height="400" data-expected-width="400">
+        <div id="one"></div>
+        <div id="two"></div>
+        <div id="three"></div>
+        <div id="four"></div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html
index 6b269e5258f..097468b7c29 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
-<title>CSS Grid Layout Test: min and max size when computing the flex fraction</title>
+<title>CSS Grid Layout Test: min and max width when computing the flex column</title>
 <link rel="author" title="Sergio Villar" href="mailto:svillar@igalia.com"/>
 <link rel="help" href="https://drafts.csswg.org/css-grid/#algo-flex-tracks"/>
 <link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=660690"/>
 <link href="/css/support/grid.css" rel="stylesheet"/>
 <link href="/css/support/width-keyword-classes.css" rel="stylesheet">
-<meta name="assert" content="This test ensures that minimum and maximum sizes are used to compute the flex fraction for indefinite free spaces."/>
+<meta name="assert" content="This test ensures that minimum and maximum widths are used to compute the flex fraction for grid columns."/>
 <style>
 .grid {
    margin: 3px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html
new file mode 100644
index 00000000000..0bac13960b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html
@@ -0,0 +1,294 @@
+<!DOCTYPE html>
+<title>CSS Grid: automatic minimum in 'auto' columns</title>
+<link rel="author" title="Sergio Villar" href="mailto:svillar@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#automatic-minimum-size">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=464287">
+<meta name="assert" content="Check that grid item's 'min-width' is honored when sizing 'auto' columns.">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/fonts/ahem.css">
+
+<style>
+.grid { font: 10px/1 Ahem; }
+
+.minWidth10 { min-width: 10px; }
+.minWidth20 { min-width: 20px; }
+.minWidth30 { min-width: 30px; }
+.minWidth40 { min-width: 40px; }
+.minWidth50 { min-width: 50px; }
+.minWidth60 { min-width: 60px; }
+.minWidth70 { min-width: 70px; }
+.minWidth90 { min-width: 90px; }
+.minWidthMaxContent { min-width: max-content; }
+
+.width50 { width: 50px; }
+.width60 { width: 60px; }
+.width200 { width: 200px; }
+
+.border5 { border: 5px solid #abc; }
+.padding8 { padding: 0px 8px 0px; }
+
+/* All these 4 cases are equivalent. We use them interchangeably. */
+.gridAuto { grid-template-columns: auto; }
+.gridMinMaxAutoAuto { grid-template-columns: minmax(auto, auto); }
+.gridMinMaxAutoMaxContent { grid-template-columns: minmax(auto, max-content); }
+.gridMinMaxMinContentAuto { grid-template-columns: minmax(min-content, auto); }
+
+/* All these 3 cases are equivalent. We use them interchangeably. */
+.gridAutoAndAuto { grid-template-columns: auto auto; }
+.gridAutoAndMinMaxAutoAuto { grid-template-columns: auto minmax(auto, auto); }
+.gridMinMaxAutoMaxContentAndAuto { grid-template-columns: minmax(auto, max-content) auto; }
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAuto">
+    <div class="firstRowFirstColumn minWidth40">XXXXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoItemSmallerThanMinSize">
+    <div class="firstRowFirstColumn minWidth40">XX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoAuto" id="gridMinMaxAutoAuto">
+    <div class="firstRowFirstColumn minWidth40">XX XX XX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoMaxContent" id="gridMinMaxAutoMaxContent">
+    <div class="firstRowFirstColumn minWidth40">XXX XX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxMinContentAuto" id="gridMinMaxMinContentAuto">
+    <div class="firstRowFirstColumn minWidth40">X X X X X X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoMultipleItems">
+    <div class="firstRowFirstColumn minWidth30">XX</div>
+    <div class="secondRowFirstColumn minWidth20"">XXXX XXXX</div>
+    <div class="thirdRowAutoColumn minWidth10">XX XXXXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoAuto" id="gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth">
+    <div class="firstRowFirstColumn minWidth30">XX</div>
+    <div class="secondRowFirstColumn">XXXXXX</div>
+    <div class="thirdRowAutoColumn minWidth20">XXXX XXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoMaxContent" id="gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth">
+    <div class="firstRowFirstColumn minWidth30">XX</div>
+    <div class="secondRowFirstColumn">XX XXXXXXXX</div>
+    <div class="thirdRowAutoColumn minWidth20">XXXX XXXX</div>
+  </div>
+</div>
+
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoFixedWidthChildren">
+    <div class="firstRowFirstColumn width200 minWidth50"></div>
+    <div class="firstRowSecondColumn width50"></div>
+  </div>
+</div>
+
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningOneNonSpannig">
+    <div class="firstRowFirstColumn">XX XX</div>
+    <div class="secondRowBothColumn minWidth50">XXXXXX X XXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningMultipleNonSpanning">
+    <div class="secondRowBothColumn minWidth60">XX XX XX</div>
+    <div class="firstRowSecondColumn">X X</div>
+    <div class="firstRowSecondColumn">XXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning">
+    <div class="firstRowSecondColumn">X XXX XX</div>
+    <div class="secondRowBothColumn minWidth70">XXX XXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoMultipleSpanning">
+    <div class="secondRowBothColumn minWidth70">XX XX XX</div>
+    <div class="firstRowBothColumn">XXXXX X XXXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning">
+    <div class="firstRowSecondColumn minWidth60">X XXX XX</div>
+    <div class="secondRowBothColumn minWidth90">XXXXX XXXXX</div>
+    <div class="firstRowFirstColumn">XX XX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning">
+    <div class="secondRowBothColumn">XX XX XX XX</div>
+    <div class="firstRowFirstColumn minWidth40">XXX</div>
+    <div class="firstRowBothColumn minWidth90">X XX XXX</div>
+    <div class="firstRowSecondColumn">X XX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoWithFixedWidthChild">
+    <div class="firstRowFirstColumn width60">XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoWithFixedWidthChildAndMinWidth">
+    <div class="firstRowFirstColumn width60 minWidth40">XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoWithFixedWidthChildAndHigherMinWidth">
+    <div class="firstRowFirstColumn width60 minWidth90">XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidth">
+    <div class="firstRowBothColumn width50">XX XXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidthAndMinWidth">
+    <div class="firstRowBothColumn width60 minWidth50">XX XXX XX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth">
+    <div class="firstRowBothColumn width60 minWidth70">XX XXX XX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoFixedMinWidthWithBorder">
+    <div class="firstRowFirstColumn minWidth40 border5">XXXXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoFixedMinWidthWithPadding">
+    <div class="firstRowFirstColumn minWidth40 padding8">XXXXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoFixedMinWidthWithBorderAndPadding">
+    <div class="firstRowFirstColumn minWidth40 border5 padding8">XXXXXX</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoAutoMinWidthWithBorder">
+    <div class="firstRowFirstColumn border5">XX XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoAutoMinWidthWithPadding">
+    <div class="firstRowFirstColumn padding8">XX XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoAutoMinWidthWithBorderAndPadding">
+    <div class="firstRowFirstColumn border5 padding8">XX XXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithBorder">
+    <div class="firstRowFirstColumn minWidthMaxContent border5">X XXXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithPadding">
+    <div class="firstRowFirstColumn minWidthMaxContent padding8">X XXXX X</div>
+  </div>
+</div>
+
+<div class="constrainedContainer">
+  <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithBorderAndPadding">
+    <div class="firstRowFirstColumn border5 padding8 minWidthMaxContent">X XXXX X</div>
+  </div>
+</div>
+
+<script>
+function testGridColumnsValues(id, computedColumnValue)
+{
+  assert_equals(window.getComputedStyle(document.getElementById(id))
+      .getPropertyValue('grid-template-columns'), computedColumnValue);
+}
+
+setup({ explicit_done: true });
+document.fonts.ready.then(() => {
+  test(() => {
+    testGridColumnsValues('gridAuto', '40px');
+    testGridColumnsValues('gridAutoItemSmallerThanMinSize', '40px');
+    testGridColumnsValues('gridMinMaxAutoAuto', '40px');
+    testGridColumnsValues('gridMinMaxAutoMaxContent', '40px');
+    testGridColumnsValues('gridMinMaxMinContentAuto', '40px');
+    testGridColumnsValues('gridAutoMultipleItems', '30px');
+    testGridColumnsValues('gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth', '60px');
+    testGridColumnsValues('gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth', '80px');
+    testGridColumnsValues('gridAutoAndAutoFixedWidthChildren', '200px 50px');
+  }, 'Check that min-width is honored when sizing auto columns.');
+  test(() => {
+    testGridColumnsValues('gridAutoAndAutoOneSpanningOneNonSpannig', '35px 15px');
+    testGridColumnsValues('gridAutoAndAutoOneSpanningMultipleNonSpanning', '20px 40px');
+    testGridColumnsValues('gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning', '20px 50px');
+    testGridColumnsValues('gridAutoAndMinMaxAutoAutoMultipleSpanning', '35px 35px');
+    testGridColumnsValues('gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning', '25px 65px');
+    testGridColumnsValues('gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning', '40px 50px');
+  }, 'Check that min-width is honored when sizing auto columns and spanning grid items.');
+  test(() => {
+    testGridColumnsValues('gridAutoWithFixedWidthChild', '60px');
+    testGridColumnsValues('gridAutoWithFixedWidthChildAndMinWidth', '60px');
+    testGridColumnsValues('gridAutoWithFixedWidthChildAndHigherMinWidth', '90px');
+    testGridColumnsValues('gridAutoAndAutoOneSpanningFixedWidth', '25px 25px');
+    testGridColumnsValues('gridAutoAndAutoOneSpanningFixedWidthAndMinWidth', '30px 30px');
+    testGridColumnsValues('gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth', '35px 35px');
+  }, 'Check the interactions between width and min-width and auto tracks.');
+  test(() => {
+    testGridColumnsValues('gridAutoFixedMinWidthWithBorder', '50px');
+    testGridColumnsValues('gridAutoFixedMinWidthWithPadding', '56px');
+    testGridColumnsValues('gridAutoFixedMinWidthWithBorderAndPadding', '66px');
+    testGridColumnsValues('gridAutoAutoMinWidthWithBorder', '40px');
+    testGridColumnsValues('gridAutoAutoMinWidthWithPadding', '46px');
+    testGridColumnsValues('gridAutoAutoMinWidthWithBorderAndPadding', '56px');
+    testGridColumnsValues('gridAutoMaxContentMinWidthWithBorder', '90px');
+    testGridColumnsValues('gridAutoMaxContentMinWidthWithPadding', '96px');
+    testGridColumnsValues('gridAutoMaxContentMinWidthWithBorderAndPadding', '106px');
+  }, 'Check that borders and paddings are considering when computing min sizes.');
+  done();
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html
new file mode 100644
index 00000000000..34a52937a7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html
@@ -0,0 +1,305 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid: indefinite grid container and percentage rows.</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid/#valdef-grid-template-columns-length-percentage"/>
+<meta name="assert" content="This test checks that percentage rows behave as 'auto' if the height of the grid container is indefinite to compute the grid container intrinsic height, but are afterwards resolved against that size."/>
+<link rel="issue" href="https://crbug.com/616716"/>
+<link rel="stylesheet" href="/css/support/grid.css"/>
+<link rel="stylesheet" href="/css/support/height-keyword-classes.css"/>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css"/>
+<style>
+.wrapper {
+    position: relative;
+    clear: both;
+}
+
+.grid {
+    font: 10px/1 Ahem;
+    width: fit-content;
+}
+
+.abspos {
+    position: absolute;
+}
+
+.fixedSize {
+    width: 200px;
+    height: 200px;
+}
+
+.oneRow100 {
+    grid-template-rows: 100%;
+}
+
+.oneRow50 {
+    grid-template-rows: 50%;
+}
+
+.twoRows {
+    grid-template-rows: 100px 50%;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+    setup({ explicit_done: true });
+</script>
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+<div id="log"></div>
+<div class="wrapper">
+    <div class="grid oneRow100" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fixedSize oneRow100" data-expected-width="200" data-expected-height="200">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="200">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid abspos oneRow100" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid max-content oneRow100" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fit-content oneRow100" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid min-content oneRow100" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid oneRow50" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="5">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fixedSize oneRow50" data-expected-width="200" data-expected-height="200">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid abspos oneRow50" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="5">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid max-content oneRow50" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="5">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fit-content oneRow50" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="5">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid min-content oneRow50" data-expected-width="40" data-expected-height="10">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="5">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid twoRows" data-expected-width="40" data-expected-height="110">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="55">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fixedSize twoRows" data-expected-width="200" data-expected-height="200">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="200" data-expected-height="100">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid abspos twoRows" data-expected-width="40" data-expected-height="110">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="55">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid max-content twoRows" data-expected-width="40" data-expected-height="110">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="55">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fit-content twoRows" data-expected-width="40" data-expected-height="110">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="55">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid min-content twoRows" data-expected-width="40" data-expected-height="110">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="55">
+            XX X
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid twoRows" data-expected-width="40" data-expected-height="100">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="50">
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fixedSize twoRows" data-expected-width="200" data-expected-height="200">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="200" data-expected-height="100">
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid abspos twoRows" data-expected-width="40" data-expected-height="100">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="50">
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid max-content twoRows" data-expected-width="40" data-expected-height="100">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="50">
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid fit-content twoRows" data-expected-width="40" data-expected-height="100">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="50">
+        </div>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="grid min-content twoRows" data-expected-width="40" data-expected-height="100">
+        <div class="firstRowFirstColumn"
+            data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="100">
+            XX X
+        </div>
+        <div class="secondRowFirstColumn"
+            data-offset-x="0" data-offset-y="100" data-expected-width="40" data-expected-height="50">
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html
new file mode 100644
index 00000000000..89ac3a3c92e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<style>
+body {
+   position: relative;
+   height: 100vh;
+}
+.item1 {
+   width: fit-content;
+   width: -moz-fit-content;
+   margin: 0px auto;
+}
+.item2 {
+   position: absolute;
+   bottom: 0;
+   background-color: cyan;
+   height: 50px;
+   width: 100%;
+}
+</style>
+<div class="item1">item1</div>
+<div class="item2">item2</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html
new file mode 100644
index 00000000000..a090f795590
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<style>
+html {
+   overflow-x: scroll;
+}
+.grid {
+   float: left;
+   overflow-y: scroll;
+   overflow-x: scroll;
+}
+.item {
+    background: lime;
+    width: 100px;
+    height: 100px;
+}
+</style>
+<p>This test passes if you see a 100x100px green box and scrollbars are disabled.</p>
+<div class="grid">
+    <div class="item">item</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html
new file mode 100644
index 00000000000..2687a5c64b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation does not apply to background-image</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-background-image-ref.html">
+<meta name=fuzzy content="2;40">
+<style>
+div { width: 100px; height: 50px; background-image: url(support/exif-orientation-2-ur.jpg); }
+.no-orient { image-orientation: none; }
+</style>
+<div></div>
+<div class="no-orient"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html
new file mode 100644
index 00000000000..85b363ecc2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation does not apply to border images</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-border-image-ref.html">
+<style>
+div {
+  width: 100px;
+  height: 50px;
+  border: 10px solid black;
+  border-image: url(support/exif-orientation-2-ur.jpg) 10;
+}
+.no-orient { image-orientation: none; }
+</style>
+<div></div>
+<div class="no-orient"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html
new file mode 100644
index 00000000000..33730a323ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation does not apply to list-style-image</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-list-style-image-ref.html">
+<meta name=fuzzy content="2;40">
+<style>
+ul { margin-left: 100px; list-style-image: url(support/exif-orientation-2-ur.jpg); }
+.no-orient { image-orientation: none; }
+</style>
+<ul><li>&nbsp;</li></ul>
+<ul class="no-orient"><li>&nbsp;</li></ul>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html
new file mode 100644
index 00000000000..dc9e5107b8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation does not apply to mask-image</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-mask-image-ref.html">
+<meta name=fuzzy content="1;22">
+<style>
+div {
+  width: 100px;
+  height: 50px;
+  background: blue;
+  mask-image: url(support/exif-orientation-2-ur.jpg);
+  mask-mode: luminance;
+}
+.no-orient { image-orientation: none; }
+</style>
+<div></div>
+<div class="no-orient"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html
new file mode 100644
index 00000000000..e5709064798
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+div { width: 100px; height: 50px; background-image: url(../support/exif-orientation-2-ur-pre-rotated.jpg); }
+</style>
+<div></div>
+<div></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html
new file mode 100644
index 00000000000..3f9b68832b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+div {
+  width: 100px;
+  height: 50px;
+  border: 10px solid black;
+  border-image: url(../support/exif-orientation-2-ur-pre-rotated.jpg) 10;
+}
+</style>
+<div></div>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html
new file mode 100644
index 00000000000..433cf98e636
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+ul { margin-left: 100px; list-style-image: url(../support/exif-orientation-2-ur-pre-rotated.jpg); }
+</style>
+<ul><li>&nbsp;</li></ul>
+<ul><li>&nbsp;</li></ul>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html
new file mode 100644
index 00000000000..ff078244151
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+div {
+  width: 100px;
+  height: 50px;
+  background: blue;
+  mask-image: url(../support/exif-orientation-2-ur-pre-rotated.jpg);
+  mask-mode: luminance;
+}
+</style>
+<div></div>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-images/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html
new file mode 100644
index 00000000000..eb89065364b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path reference box with inline boxes</title>
+<link rel="author" title="Fredrik Söderquist" href="mailto:fs@opera.com">
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-box-3/#content-area">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#funcdef-polygon">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=641907">
+<link rel="match" href="reference/clip-path-reference-box-004-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css"/>
+<meta name="assert" content="Check that the 'clip-path' property applied to an inline that spans multiple lines uses the correct reference boxes/reference box for each fragment.">
+
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  overflow: hidden;
+  line-height: 50px;
+  font-size: 50px;
+  font-family: Ahem;
+}
+span {
+  background-color: green;
+  color: green;
+  clip-path: polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
+}
+</style>
+<div>
+<span>XX XX</span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html
new file mode 100644
index 00000000000..3464a4712a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 50px; background-color: green"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-multicol/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscrollBehavior-manual.html b/tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscrollBehavior-manual.html
rename to tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior-manual.html
diff --git a/tests/wpt/web-platform-tests/css/css-page/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-page/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-shapes/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-text/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-text/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html
new file mode 100644
index 00000000000..298cbf7b312
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre-wrap'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#hanging">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre-wrap', white spaces at the end of the line are preserved. In this test, the overflowing end-of-line white spaces following the 'A', the 'GH', the 'MNO' and the 'WXYZ' conditionally 'hang' while they do not affect the intrinsic min-content size." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the "A", the "GH",
+      the "MNO" and the "WXYZ" glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 0;
+      /*
+      'width: 0' will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div#test-overlapped-red
+    {
+      background-color: red;
+      float: left;
+      white-space: pre-wrap;
+      width: auto;
+    }
+
+  div#reference-overlapping-green
+    {
+      background-color: green;
+      position: absolute;
+      width: auto;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="min-sized-parent">
+
+    <div id="test-overlapped-red">A       &NewLine;GH      &NewLine;MNO     &NewLine;WXYZ    </div>
+
+  </div>
+
+  <!--
+
+  The sequences of white spaces following
+  the "A", the "GH", the "MNO" and the
+  "WXYZ" do not get collapsed. That is by
+  definition of 'white-space: pre-wrap'.
+  They 'hang': they behave like 'ink
+  overflow' while not contributing to
+  min-content sizing.
+
+  The line feeds (&NewLine;) wrap
+  content to the next line box.
+
+  Since div#test-overlapped-red
+  is floated and since its parent in
+  the flow is 0-width, then the float
+  is min-content sized.
+  Since the widest line box
+  is created by the 4th line box
+  (due to "WXYZ" content), then
+  div#test-overlapped-red
+  must not be wider than 100px.
+
+  -->
+
+  <div id="reference-overlapping-green">1234<br>5678<br>90AB<br>CDEF</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html
new file mode 100644
index 00000000000..b19c6eb27cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre-wrap'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#hanging">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre-wrap', white spaces at the end of the line are preserved. In this test, the 4 overflowing white spaces following the 'ABCD', following the 'GHIJ', following the 'MNOP' and following the 'WXYZ' conditionally 'hang' while they do not affect the intrinsic min-content size." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the ABCD, GHIJ,
+      MNOP, WXYZ glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 0;
+      /*
+      'width: 0' will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div.test-overlapped-red
+    {
+      background-color: red;
+      float: left;
+      white-space: pre-wrap;
+      width: auto;
+    }
+
+  div#reference-overlapping-green
+    {
+      background-color: green;
+      position: absolute;
+      width: auto;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="min-sized-parent">
+
+    <div class="test-overlapped-red">ABCD    </div>
+
+    <div class="test-overlapped-red">GHIJ    </div>
+
+    <div class="test-overlapped-red">MNOP    </div>
+
+    <div class="test-overlapped-red">WXYZ    </div>
+
+  </div>
+
+  <!--
+
+  The sequences of 4 white spaces following
+  the "ABCD", following the "GHIJ", following
+  the "MNOP" and following the "WXYZ" do not
+  get collapsed due to
+  'white-space: pre-wrap': they hang. Such
+  sequences of 4 hanging-overflowing end-of-line
+  white spaces are not considered with regards
+  to the line box content for fit.
+
+  Since the 4 div.test-overlapped-red
+  are floated and since its parent in
+  the flow is 0-width, then these 4 floats
+  are min-content sized.
+
+  -->
+
+  <div id="reference-overlapping-green">1234<br>5678<br>90AB<br>CDEF</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html
new file mode 100644
index 00000000000..d60120cc180
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre', preserved white spaces at the end of the line affect the intrinsic min-content size." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the A, G, M, Z glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 0;
+      /*
+      This will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div#reference-overlapped-red
+    {
+      background-color: red;
+      position: absolute;
+      width: auto;
+      z-index: -1;
+    }
+
+  div#test-overlapping-green
+    {
+      background-color: green;
+      float: left;
+      white-space: pre;
+      width: auto;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="reference-overlapped-red">1234<br>567<br>89<br>0</div>
+
+  <div id="min-sized-parent">
+
+    <div id="test-overlapping-green">A&NewLine;G &NewLine; M&NewLine; Z  </div>
+
+  </div>
+
+  <!--
+
+  The white spaces preceding or following
+  the "G", "M" and "Z" do not get
+  wrapped. That is by definition of
+  'white-space: pre'.
+
+  The line feeds (&NewLine;) wrap
+  content to the next line box.
+
+  Since div#test-overlapping-green
+  is floated and since its parent in
+  the flow is 0-width, then the float
+  is min-content sized.
+
+  -->
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html
new file mode 100644
index 00000000000..b9a552ebff1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre', preserved white spaces at the end of the line affect the intrinsic min-content size. Overflow-wrap makes no difference." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the A, G, M, Z glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 0;
+      /*
+      This will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div#reference-overlapped-red
+    {
+      background-color: red;
+      position: absolute;
+      width: auto;
+      z-index: -1;
+    }
+
+  div.test-overlapping-green
+    {
+      background-color: green;
+      float: left;
+      white-space: pre;
+      width: auto;
+    }
+
+  div#last
+    {
+      overflow-wrap: break-word;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="reference-overlapped-red">1234<br>567<br>89<br>0</div>
+
+  <div id="min-sized-parent">
+
+    <div class="test-overlapping-green">A   </div>
+
+    <div class="test-overlapping-green"> G  </div>
+
+    <div class="test-overlapping-green">  M </div>
+
+    <div class="test-overlapping-green" id="last">   Z</div>
+
+  </div>
+
+  <!--
+
+  The 3 white spaces following or preceding
+  the "A", "G", "M" and "Z" do not
+  get wrapped. That is by definition of
+  'white-space: pre'.
+
+  Since the div.test-overlapping-green
+  are floated and since their parent in
+  the flow is 0-width, then these floats
+  are min-content sized.
+
+  -->
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html
new file mode 100644
index 00000000000..103cb077226
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: max-content sizing and 'white-space: pre-wrap'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="help" href="https://www.w3.org/TR/css-sizing-3/#auto-box-sizes">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre-wrap', preserved white spaces at the beginning and at the end of the line affect the intrinsic max-content size." name="assert">
+
+  <style>
+  div#wrapper
+    {
+      color: transparent;
+      /*
+      so that background colors can
+      shine through the A, G, M, Z glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 7em;
+      /*
+      'width: 7em' gives more inline-size
+      than needed or required by each
+      overlapping-test-green <div>s.
+      If an implementation goes wrong
+      and makes one of
+      overlapping-test-green <div>s
+      wider than 4em, then we will see
+      red.
+      */
+    }
+
+  div#overlapped-reference-red
+    {
+      background-color: red;
+      height: 4em;
+      position: absolute;
+      width: 4em;
+      z-index: -1;
+    }
+
+  div.overlapping-test-green
+    {
+      background: linear-gradient(to right, green 4em, red 3em);
+      /*
+      If one of the overlapping-test-green <div>s become wider
+      than 4em, then we will see the part beyond 4em of this
+      linear-gradient background which is red.
+      https://www.w3.org/TR/css-images-3/#linear-gradients
+      */
+      float: left;
+      /*
+      [
+      max-content inline size:
+      The box's "ideal" size in the inline axis. Usually
+      the narrowest inline size it could take while fitting
+      around its contents if none of the soft wrap
+      opportunities within the box were taken.
+      ]
+      https://www.w3.org/TR/css-sizing-3/#max-content-inline-size
+      */
+      white-space: pre-wrap;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="wrapper">
+
+    <div id="overlapped-reference-red"></div>
+
+    <div class="overlapping-test-green">A   </div>
+
+    <div class="overlapping-test-green"> G  </div>
+
+    <div class="overlapping-test-green">  M </div>
+
+    <div class="overlapping-test-green">   Z</div>
+
+  </div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html
new file mode 100644
index 00000000000..45de8ed01cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: max-content sizing and 'white-space: pre'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="help" href="https://www.w3.org/TR/css-sizing-3/#auto-box-sizes">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre', preserved white spaces at the beginning and at the end of the line affect the intrinsic max-content size." name="assert">
+
+  <style>
+  div#wrapper
+    {
+      color: transparent;
+      /*
+      so that background colors can
+      shine through the A, G, M, Z glyphs
+      */
+      font-family: Ahem;
+      font-size: 25px;
+      line-height: 1;
+      width: 7em;
+      /*
+      'width: 7em' gives more inline-size
+      than needed or required by each
+      overlapping-test-green <div>s.
+      If an implementation goes wrong
+      and makes one of
+      overlapping-test-green <div>s
+      wider than 4em, then we will see
+      red.
+      */
+    }
+
+  div#overlapped-reference-red
+    {
+      background-color: red;
+      height: 4em;
+      position: absolute;
+      width: 4em;
+      z-index: -1;
+    }
+
+  div.overlapping-test-green
+    {
+      background: linear-gradient(to right, green 4em, red 3em);
+      /*
+      If one of the overlapping-test-green <div>s become wider
+      than 4em, then we will see the part beyond 4em of this
+      linear-gradient background which is red.
+      https://www.w3.org/TR/css-images-3/#linear-gradients
+      */
+      float: left;
+      /*
+      [
+      max-content inline size:
+      The box's "ideal" size in the inline axis. Usually
+      the narrowest inline size it could take while fitting
+      around its contents if none of the soft wrap
+      opportunities within the box were taken.
+      ]
+      https://www.w3.org/TR/css-sizing-3/#max-content-inline-size
+      */
+      white-space: pre;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="wrapper">
+
+    <div id="overlapped-reference-red"></div>
+
+    <div class="overlapping-test-green">A   </div>
+
+    <div class="overlapping-test-green"> G  </div>
+
+    <div class="overlapping-test-green">  M </div>
+
+    <div class="overlapping-test-green">   Z</div>
+
+  </div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html
new file mode 100644
index 00000000000..4a2d5a3fe32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre-line'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre-line', sequence of white spaces are collapsed into 1 white space, the tabs are converted into a single white space and then the white spaces at the end of the line are removed." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the A, G, M glyphs
+      */
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+      width: 0;
+      /*
+      This will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div#reference-overlapped-red
+    {
+      background-color: red;
+      position: absolute;
+      width: auto;
+      z-index: -1;
+    }
+
+  div#test-overlapping-green
+    {
+      background-color: green;
+      float: left;
+      white-space: pre-line;  /* spaces and tabs collapse */
+      width: auto;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="reference-overlapped-red">12<br>3</div>
+
+  <div id="min-sized-parent">
+
+    <div id="test-overlapping-green">A &Tab; &Tab; GM   &Tab;</div>
+
+  </div>
+
+  <!--
+
+  The sequence of white spaces
+  are collapsed. The tabs are
+  converted into a single
+  white space character. Then
+  the spaces at the end-of-line
+  are removed. That
+  is by definition of
+  'white-space: pre-line'.
+
+  The end result is
+  [A
+   GM]
+
+  Since div#test-overlapping-green
+  is floated and since its parent in
+  the flow is 0-width, then the float
+  is min-content sized.
+
+  -->
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html
new file mode 100644
index 00000000000..0369de29a28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Text Test: min-content sizing and 'white-space: pre-line'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+  <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-2">
+  <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+
+  <meta content="" name="flags">
+  <meta content="When 'white-space' is 'pre-line', sequence of white spaces are collapsed into 1 white space, the tabs are converted into a single white space and then the white spaces at the end of the line are removed." name="assert">
+
+  <style>
+  div
+    {
+      color: transparent;
+      /*
+      so that background-color can
+      shine through the A, G, M, Z glyphs
+      */
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+      width: 0;
+      /*
+      This will trigger
+      min-content size
+      for div#min-sized-parent
+      */
+    }
+
+  div#reference-overlapped-red
+    {
+      background-color: red;
+      position: absolute;
+      width: auto;
+      z-index: -1;
+    }
+
+  div.test-overlapping-green
+    {
+      background-color: green;
+      float: left;
+      white-space: pre-line;  /* spaces and tabs collapse */
+      width: auto;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="reference-overlapped-red">12<br>3</div>
+
+  <div id="min-sized-parent">
+
+    <div class="test-overlapping-green"> &Tab; &Tab; AG </div>
+
+    <div class="test-overlapping-green"> MZ &Tab; &Tab; </div>
+
+  </div>
+
+  <!--
+
+  The sequence of white spaces
+  are collapsed. The tabs are
+  converted into a single
+  white space character. Then
+  the spaces at the end-of-line
+  are removed. That
+  is by definition of
+  'white-space: pre-line'.
+
+  The end result is
+  [AG
+   MZ]
+
+  Since div#test-overlapping-green
+  is floated and since its parent in
+  the flow is 0-width, then the float
+  is min-content sized.
+
+  -->
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-transforms/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-transitions/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/css-values/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-values/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/60x60-red.png b/tests/wpt/web-platform-tests/css/cssom-view/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html b/tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html
index 9b45d66f4ff..7bc37e007a7 100644
--- a/tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html
+++ b/tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html
@@ -130,4 +130,19 @@ test(function() {
   assert_not_equals(getComputedStyle(elem).backgroundImage, originalComputedValue,
                     "getComputedStyle(elem).backgroundImage after setting background-image");
 }, "Changes to CSS declaration block after a base URL change");
+
+test(function() {
+  let e1 = document.createElement('div');
+  let e2 = document.createElement('div');
+  document.body.append(e1, e2);
+  this.add_cleanup(() => {
+    e1.remove();
+    e2.remove();
+  });
+  e1.style.cssText = "all:revert;border-bottom-left-radius:1px;";
+  e2.style.cssText = "all:unset;border-bottom-left-radius:1px;";
+  let processed = e1.style.cssText.split(';')
+    .map(x => x.replace(/revert$/, 'unset')).join(';');
+  assert_equals(processed, e2.style.cssText);
+}, "Expansion of all:unset and all:revert treated identically");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/support/60x60-red.png b/tests/wpt/web-platform-tests/css/cssom/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html b/tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html
new file mode 100644
index 00000000000..7400c8b3793
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS Filter Effects: feTurbulence with negative values from baseFrequency</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#element-attrdef-feturbulence-basefrequency">
+<link rel="help" href="https://crbug.com/1068863"/>
+<link rel="match" href="reference/filter-turbulence-invalid-001-ref.html">
+<meta name="assert" content="This test checks that negative baseFrequency values are unsupported for feTurbulence.">
+<style>
+.target {
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  background-color: red;
+}
+</style>
+<div class="target" style="filter: url(#fn1)"></div>
+<div class="target" style="filter: url(#fn2)"></div>
+<div class="target" style="filter: url(#tb1)"></div>
+<div class="target" style="filter: url(#tb2)"></div>
+<svg height="0" color-interpolation-filters="sRGB">
+    <!-- type=fractalNoise -->
+    <filter id="fn1" x="0" y="0" width="1" height="1">
+        <feTurbulence type="fractalNoise" baseFrequency="-1 1"/>
+        <feComponentTransfer>
+            <feFuncR type="discrete" tableValues="1 0 1"/>
+            <feFuncG type="discrete" tableValues="0 0.502 0"/> <!-- map [0..1/3] -> 0; [1/3...2/3] -> 0.502; [2/3..1] -> 0 -->
+            <feFuncB type="discrete" tableValues="0"/>
+            <feFuncA type="discrete" tableValues="0 1 0"/>
+        </feComponentTransfer>
+    </filter>
+
+    <filter id="fn2" x="0" y="0" width="1" height="1">
+        <feTurbulence type="fractalNoise" baseFrequency="1 -1"/>
+        <feComponentTransfer>
+            <feFuncR type="discrete" tableValues="1 0 1"/>
+            <feFuncG type="discrete" tableValues="0 0.502 0"/> <!-- map [0..1/3] -> 0; [1/3...2/3] -> 0.502; [2/3..1] -> 0 -->
+            <feFuncB type="discrete" tableValues="0"/>
+            <feFuncA type="discrete" tableValues="0 1 0"/>
+        </feComponentTransfer>
+    </filter>
+
+    <!-- type=turbulence -->
+    <filter id="tb1" x="0" y="0" width="1" height="1">
+        <feTurbulence type="turbulence" baseFrequency="-1 1"/>
+        <feColorMatrix values="1 0 0 0 0, 0 1 0 0 0.502, 0 0 1 0 0, 0 0 0 1 1"/>
+    </filter>
+
+    <filter id="tb2" x="0" y="0" width="1" height="1">
+        <feTurbulence type="turbulence" baseFrequency="1 -1"/>
+        <feColorMatrix values="1 0 0 0 0, 0 1 0 0 0.502, 0 0 1 0 0, 0 0 0 1 1"/>
+    </filter>
+</svg>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html b/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html
new file mode 100644
index 00000000000..afd3facc10c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<style>
+.target {
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+</style>
+<div class="target"></div>
+<div class="target"></div>
+<div class="target"></div>
+<div class="target"></div>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/60x60-red.png b/tests/wpt/web-platform-tests/css/filter-effects/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4a60f780f00443c9c9a10b9fa1f447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*<jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfEmlzuQ<1cFzubXBk|nMYCC>S|xv6<249-QVi6yBi3gww4
z84B*6z5(HleBwYwZk{fVAsP4Ho@3->VBlchkp2JMEhm9(EUQo2%VrV@UNUpX$1;`+
Ty_~-WXd;8BtDnm{r-UW|v1>m&

diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/visual.md b/tests/wpt/web-platform-tests/docs/writing-tests/visual.md
index de87d650247..a8ae53d0715 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/visual.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/visual.md
@@ -14,7 +14,7 @@ Visuals tests are test files which have `-visual` at the end of their
 filename, before the extension. There is nothing needed in them to
 make them work.
 
-They should follow the [general test guidelines](general guidelines),
+They should follow the [general test guidelines](general-guidelines),
 especially noting the requirement to be self-describing (i.e., they
 must give a clear pass condition in their rendering).
 
diff --git a/tests/wpt/web-platform-tests/event-timing/click-timing.html b/tests/wpt/web-platform-tests/event-timing/click-timing.html
index 4544734f73f..84943f9590a 100644
--- a/tests/wpt/web-platform-tests/event-timing/click-timing.html
+++ b/tests/wpt/web-platform-tests/event-timing/click-timing.html
@@ -32,7 +32,7 @@
       assert_not_equals(timeAfterFirstClick, undefined);
       assert_not_equals(timeAfterSecondClick, undefined);
       // First click.
-      verifyClickEvent(observedEntries[0]);
+      verifyClickEvent(observedEntries[0], 'button');
       assert_between_exclusive(observedEntries[0].processingStart,
           timeBeforeFirstClick,
           timeAfterFirstClick,
@@ -41,7 +41,7 @@
           "timeAfterFirstClick should be later than first click's start time.");
 
       // Second click.
-      verifyClickEvent(observedEntries[1]);
+      verifyClickEvent(observedEntries[1], 'button');
       assert_between_exclusive(observedEntries[1].processingStart,
           timeAfterFirstClick,
           timeAfterSecondClick,
diff --git a/tests/wpt/web-platform-tests/event-timing/crossiframe.html b/tests/wpt/web-platform-tests/event-timing/crossiframe.html
index 71140868434..0376fb91f94 100644
--- a/tests/wpt/web-platform-tests/event-timing/crossiframe.html
+++ b/tests/wpt/web-platform-tests/event-timing/crossiframe.html
@@ -24,7 +24,7 @@
   function validateEntries(entries) {
     assert_equals(entries.length, 1, "Only 1 entry should be received");
     const entry = entries[0];
-    verifyClickEvent(entry, true);
+    verifyClickEvent(entry, 'button', true);
 
     assert_less_than(entry.processingStart, clickDone,
         "The entry's processing start should be before clickDone.");
@@ -38,7 +38,8 @@
     }
     // |childFrameData| has properties with the same names as its
     // PerformanceEventTiming counterpart.
-    verifyClickEvent(childFrameData);
+    verifyClickEvent(childFrameData, null);
+    assert_equals(childFrameData.target, 'iframe_div');
 
     assert_less_than(childFrameData.processingStart, childFrameData.clickDone,
         "The entry's processing start should be before than the child frame's clickDone.");
diff --git a/tests/wpt/web-platform-tests/event-timing/disconnect-target.html b/tests/wpt/web-platform-tests/event-timing/disconnect-target.html
new file mode 100644
index 00000000000..b395cd4181b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/event-timing/disconnect-target.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<meta charset=utf-8 />
+<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/event-timing-test-utils.js></script>
+
+<button id='the_button'>ClickMe</button>
+
+<script>
+async_test(function(t) {
+  assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
+  const observer = new PerformanceObserver(t.step_func_done((entryList) => {
+    const entries = entryList.getEntries().filter(e => e.name === 'mousedown');
+    // There must only be one click entry.
+    assert_equals(entries.length, 1);
+    const entry = entries[0];
+    // This checks that entry.target returns the correct button Node.
+    verifyClickEvent(entry, 'the_button', true);
+    const button = document.getElementById('the_button');
+    button.parentNode.removeChild(button);
+    // After removing the button, entry.target should now return null.
+    assert_equals(entry.target, null);
+  }));
+  observer.observe({entryTypes: ['event']});
+  clickAndBlockMain('the_button');
+}, "Event Timing: when target is disconnected, entry.target returns null.");
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/event-timing/event-retarget.html b/tests/wpt/web-platform-tests/event-timing/event-retarget.html
new file mode 100644
index 00000000000..130e70092b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/event-timing/event-retarget.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<meta charset=utf-8 />
+<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/event-timing-test-utils.js></script>
+
+<custom-button id='custom_button'></custom-button>
+
+<script>
+async_test(function(t) {
+  assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
+  let innerButtonClicked = false;
+  customElements.define('custom-button', class extends HTMLElement {
+    connectedCallback() {
+      this.attachShadow({mode: 'open'});
+      this.shadowRoot.innerHTML = `<button id='inner_button_id'>Click me</button>`;
+      this.shadowRoot.getElementById('inner_button_id').onclick = () => {
+        innerButtonClicked = true;
+      };
+    }
+  });
+  const observer = new PerformanceObserver(t.step_func_done((entryList) => {
+    const entries = entryList.getEntries().filter(e => e.name === 'mousedown');
+    // There must only be one click entry.
+    assert_equals(entries.length, 1);
+    verifyClickEvent(entries[0], 'custom_button', true);
+    assert_true(innerButtonClicked);
+  }));
+  observer.observe({entryTypes: ['event']});
+  clickAndBlockMain('custom_button');
+}, "Event Timing: target reports the last Event Target, i.e. nothing from shadow DOM.");
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html b/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
index 0a189b0bc2a..b5b1683bd4c 100644
--- a/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
+++ b/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
@@ -27,10 +27,7 @@
       // This ensures that the entry is exposing timing from the second click, i.e.
       // the one from the clickAndBlockMain() call.
       assert_greater_than_equal(entry.processingStart, beforeClick);
-      // Check that the first input entry was also from the second click.
-      const firstInput = performance.getEntriesByType('first-input');
-      assert_equals(firstInput.length, 1);
-      assert_greater_than_equal(firstInput[0].processingStart, beforeClick);
+      verifyClickEvent(entry, 'div2', true);
     }));
     observer.observe({entryTypes: ['event']});
     document.getElementById('div').click();
diff --git a/tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html b/tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html
index 2b0d6307269..8c42c702d66 100644
--- a/tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html
+++ b/tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html
@@ -2,7 +2,7 @@
 <html>
 <body>
 <script src=event-timing-test-utils.js></script>
-<div style="width: 300px; height: 300px" onmousedown="mainThreadBusy(120)">
+<div style="width: 300px; height: 300px" id='iframe_div' onmousedown="mainThreadBusy(120)">
 <script>
 (async () => {
   const clickTimeMin = performance.now();
@@ -30,6 +30,7 @@
     // Other values
     "clickTimeMin": clickTimeMin,
     "clickDone" : clickDone,
+    "target": entry.target.id,
   }, '*');
 }) ();
 </script>
diff --git a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
index 3ba272f9341..cc824d9cba6 100644
--- a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
+++ b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
@@ -21,7 +21,7 @@ function mainThreadBusy(duration) {
 // This method should receive an entry of type 'event'. |is_first| is true only
 // when the event also happens to correspond to the first event. In this case,
 // the timings of the 'first-input' entry should be equal to those of this entry.
-function verifyClickEvent(entry, is_first=false) {
+function verifyClickEvent(entry, targetId, is_first=false) {
   assert_true(entry.cancelable);
   assert_equals(entry.name, 'mousedown');
   assert_equals(entry.entryType, 'event');
@@ -47,6 +47,8 @@ function verifyClickEvent(entry, is_first=false) {
     assert_equals(firstInput.processingEnd, entry.processingEnd);
     assert_equals(firstInput.cancelable, entry.cancelable);
   }
+  if (targetId)
+    assert_equals(entry.target, document.getElementById(targetId));
 }
 
 function wait() {
diff --git a/tests/wpt/web-platform-tests/event-timing/toJSON.html b/tests/wpt/web-platform-tests/event-timing/toJSON.html
index a2d7df42da5..b2de4767c42 100644
--- a/tests/wpt/web-platform-tests/event-timing/toJSON.html
+++ b/tests/wpt/web-platform-tests/event-timing/toJSON.html
@@ -27,6 +27,7 @@
           'processingStart',
           'processingEnd',
           'cancelable',
+          'target',
         ];
         for (const key of keys) {
           assert_equals(json[key], entry[key],
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers
new file mode 100644
index 00000000000..6604450991a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Embedder-Policy: require-corp
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html
index a4627cb8c25..eed36446506 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html
@@ -1,45 +1,44 @@
 <!DOCTYPE html>
 <head>
-<title>An image with loading='lazy' in cross origin iframe loads when it gets
-       visible by scrolling the iframe's scroll port</title>
-<link rel="help" href="https://github.com/scott-little/lazyload">
+<title>A below-viewport loading=lazy image in a cross origin iframe loads only
+       when scrolled into viewport</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/urls-and-fetching.html#lazy-loading-attributes">
+<link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 </head>
 
 <iframe id="iframe" width="500px" height="500px"></iframe>
+
 <script>
-promise_test(async t => {
+promise_test(t => {
   iframe.src =
-      get_host_info().HTTP_NOTSAMESITE_ORIGIN +
-      new URL("resources/", self.location).pathname +
-      "image-loading-lazy-below-viewport-iframe.html";
+    get_host_info().HTTP_NOTSAMESITE_ORIGIN +
+    new URL("resources/", self.location).pathname +
+    "image-loading-lazy-below-viewport.html";
 
-  let image_loaded = false;
+  // Wait for the frame to report that its window load event fired.
+  return new Promise(resolve => {
+    window.addEventListener("message",
+                            event => resolve(event.data), {once: true});
+  }).then(iframe_message => {
+    assert_equals(iframe_message, "window_loaded",
+                  "The loading=lazy image should not block the iframe's load " +
+                  "event");
 
-  await new Promise(resolve => {
-    window.addEventListener("message", event => {
-      if (event.data == "window_loaded") {
-        resolve();
-      } else if (event.data == "image_loaded") {
-        image_loaded = true;
-      }
-    }, { once: true });
-  });
+    // Tell the iframe to scroll the image element into view.
+    frames[0].postMessage("scroll", "*");
 
-  assert_false(image_loaded,
-      "lazy-load image shouldn't block window load event");
-
-  // Scroll to make the image element gets visible in view.
-  frames[0].postMessage("scroll", "*");
-
-  await new Promise(resolve => {
-    window.addEventListener("message", event => {
-      assert_equals(event.data, "image_loaded",
-          "lazy-load image should be loaded once after it gets visible");
-      resolve();
+    return new Promise(resolve => {
+      window.addEventListener("message", event => resolve(event.data));
     });
-  });
-});
+  }).then(iframe_message => {
+    assert_equals(iframe_message, "image_loaded",
+                  "The below-viewport loading=lazy image should load only " +
+                  "once scrolled into the viewport");
+
+  }); // new Promise();
+}); // promise_test.
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html
index 1d3d3bc46a6..85060d2193d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
 <head>
-<title>An image with loading='lazy' in cross origin iframe loads when it gets
-       visible by scrolling the parent scroll container of the iframe</title>
-<link rel="help" href="https://github.com/scott-little/lazyload">
+<title>A loading=lazy image in a below-viewport cross-origin iframe loads only
+       when the cross-origin iframe is scrolled into view</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/urls-and-fetching.html#lazy-loading-attributes">
+<link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
@@ -10,36 +12,35 @@
 
 <div style="height:1000vh;"></div>
 <iframe id="iframe" width="500px" height="500px"></iframe>
+
 <script>
-promise_test(async t => {
+promise_test(t => {
   iframe.src =
     get_host_info().HTTP_NOTSAMESITE_ORIGIN +
     new URL("resources/", self.location).pathname +
-    "image-loading-lazy-in-viewport-iframe.html";
+    "image-loading-lazy-in-viewport.html";
 
-  let image_loaded = false;
+  // Wait for the frame to report that its window load event fired.
+  return new Promise(resolve => {
+    window.addEventListener("message",
+                            event => resolve(event.data), {once: true});
+  }).then(iframe_message => {
+    assert_equals(iframe_message, "window_loaded",
+                  "The loading=lazy image should not block the iframe's load " +
+                  "event");
 
-  await new Promise(resolve => {
-    window.addEventListener("message", event => {
-      if (event.data == "window_loaded") {
-        resolve();
-      } else if (event.data == "image_loaded") {
-        image_loaded = true;
-      }
-    }, { once: true });
-  });
+    // Scroll the iframe into view, which also puts the image into view.
+    iframe.scrollIntoView();
 
-  assert_false(image_loaded,
-      "lazy-load image shouldn't block window load event");
-
-  iframe.scrollIntoView();
-
-  await new Promise(resolve => {
-    window.addEventListener("message", event => {
-      assert_equals(event.data, "image_loaded",
-          "lazy-load image should be loaded once after it gets visible");
-      resolve();
+    return new Promise(resolve => {
+      window.addEventListener("message", event => resolve(event.data));
     });
-  });
-});
+  }).then(iframe_message => {
+    assert_equals(iframe_message, "image_loaded",
+                  "The below-viewport loading=lazy image should load only " +
+                  "once scrolled into the viewport");
+
+  }); // new Promise().
+
+}); // promise_test().
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html
index 05b51705e72..fbcadd86c99 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html
@@ -9,7 +9,7 @@
 
 <div style="height:1000vh;"></div>
 <iframe id="iframe" sandbox="allow-same-origin"
-        src="resources/image-loading-lazy-in-viewport-iframe.html">
+        src="resources/image-loading-lazy-in-viewport.html">
 </iframe>
 <script>
 promise_test(async t => {
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html
index f039db5fc24..8e22c1fb549 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html
@@ -8,7 +8,7 @@
 </head>
 
 <div style="height:1000vh;"></div>
-<iframe id="iframe" src="resources/image-loading-lazy-in-viewport-iframe.html">
+<iframe id="iframe" src="resources/image-loading-lazy-in-viewport.html">
 </iframe>
 <iframe id="sandboxediframe" sandbox="allow-same-origin"
         src="resources/subframe.html">
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html
new file mode 100644
index 00000000000..7c20a3831ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html
@@ -0,0 +1,55 @@
+<head>
+  <title>Images with loading='lazy' can be lazy loaded multiple times</title>
+  <link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/urls-and-fetching.html#lazy-loading-attributes">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <!-- This is used to represent the top of the viewport, so we can scroll the
+       below-viewport image out-of-view later in the test -->
+  <div id="top_div"></div>
+  <div style="height:1000vh;"></div>
+  <img id="below_viewport" loading="lazy" src="resources/image.png?first">
+
+<script>
+  const t = async_test("Images with loading='lazy' can be lazy loaded multiple times");
+  const image = document.querySelector('#below_viewport');
+  const top_div = document.querySelector('#top_div');
+
+  let has_window_load_fired = false;
+
+  // This should be triggered first.
+  window.addEventListener('load', t.step_func(() => {
+    has_window_load_fired = true;
+    // Scroll the loading=lazy below-viewport image into view, so that it loads.
+    image.scrollIntoView();
+  }));
+
+  image.onload = t.step_func(() => {
+    assert_true(has_window_load_fired,
+                "The loading=lazy below-viewport image should not block the " +
+                "window load event");
+    changeImageSourceAndScrollToTop();
+  });
+
+  function changeImageSourceAndScrollToTop() {
+    top_div.scrollIntoView();
+
+    // Lazily load a "different" image.
+    image.src = 'resources/image.png?second';
+    image.onload =
+      t.unreached_func("The loading=lazy below-viewport image should lazily " +
+                       "load its second image, and not load it eagerly when " +
+                       "the `src` attribute is changed");
+
+    // In 1s, scroll the image *back* into view, and record that it loads
+    // successfully.
+    t.step_timeout(() => {
+      image.onload = t.step_func_done();
+      image.scrollIntoView();
+    }, 1000);
+  }
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport-iframe.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html
similarity index 89%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport-iframe.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html
index 65218168f6f..486aeb0f24f 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport-iframe.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <div style="height:1000vh;"></div>
+
 <img id="img" loading="lazy" src="image.png">
+
 <script>
+  const img = document.querySelector('#img');
+
   img.addEventListener("load", () => {
     parent.postMessage("image_loaded", "*");
   });
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport-iframe.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html
similarity index 66%
rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport-iframe.html
rename to tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html
index 0b670e7e4c6..e62fc9af4c2 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport-iframe.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html
@@ -1,6 +1,12 @@
 <!DOCTYPE html>
+
+<!-- This frame is used by image-loading-lazy-in-cross-origin-iframe-002.sub.html -->
+
 <img id="img" loading="lazy" src="image.png">
+
 <script>
+  const img = document.querySelector('#img');
+
   img.addEventListener("load", () => {
     parent.postMessage("image_loaded", "*");
   });
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html
index 846be4f8af1..029d0f6e9ac 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html
@@ -3,9 +3,12 @@
 <head>
 <meta charset="utf-8">
 <title>Cramped elements</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cramped-elements">
 <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#subscripts-and-superscripts-msub-msup-msubsup">
-<meta name="assert" content="Verify definition of cramped elements.">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#fractions-mfrac">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#radicals-msqrt-mroot">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#displaystyle-and-scriptlevel-in-scripts">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#user-agent-stylesheet">
+<meta name="assert" content="Verify default calculation of math-superscript-shift-style on MathML elements">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
@@ -28,15 +31,6 @@
   .testedElement *:last-child {
       background: pink;
   }
-  .oof1 {
-      position: absolute;
-  }
-  .oof2 {
-      position: fixed;
-  }
-  .nobox {
-      display: none;
-  }
 </style>
 <script>
   function assert_cramped(id, expected, name) {
@@ -76,7 +70,7 @@
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
           assert_cramped("mroot-001", true);
-      }, "child of parent");
+      }, "child of mroot");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
@@ -106,111 +100,43 @@
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
           assert_cramped("munder-001", false, "base");
-          assert_cramped("munder-002", true, "underscript");
+          assert_cramped("munder-002", false, "underscript");
       }, "child of munder");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
           assert_cramped("mover-001", false, "base");
-          assert_cramped("mover-002", false, "non-accent overscript");
-      }, "child of mover");
+          assert_cramped("mover-002", false, "overscript");
+      }, "child of mover (non-accent overscript)");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
           assert_cramped("munderover-001", false, "base");
-          assert_cramped("munderover-002", true, "underscript");
-          assert_cramped("munderover-003", false, "non-accent overscript");
-      }, "child of munderover");
+          assert_cramped("munderover-002", false, "underscript");
+          assert_cramped("munderover-003", false, "overscript");
+      }, "child of munderover (non-accent overscript)");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mover-003", false, "accent overscript");
-          assert_cramped("mover-004", false, "accent superscript");
-      }, "accent child of mover");
+          assert_cramped("mover-003", true, "base");
+          assert_cramped("mover-004", false, "overscript");
+      }, "accent child of mover (accent overscript)");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("munderover-004", false, "accent overscript");
-          assert_cramped("munderover-005", false, "accent superscript");
-      }, "accent child of munderover");
+          assert_cramped("munderover-004", true, "base");
+          assert_cramped("munderover-005", false, "underscript");
+          assert_cramped("munderover-006", false, "overscript");
+      }, "accent child of munderover (accent overscript)");
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("math-011", false);
-          assert_cramped("mrow-011", false, "mrow");
-      }, "child of non-cramped element, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mrow-012", true);
-      }, "child of cramped element, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("msqrt-011", true);
-      }, "child of msqrt, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mroot-011", true);
-      }, "child of parent, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mfrac-011", false, "numerator");
-          assert_cramped("mfrac-012", true, "denominator");
-      }, "child of mfrac, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("msub-011", false, "base");
-          assert_cramped("msub-012", true, "subscript");
-      }, "child of msub, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("msup-011", false, "base");
-          assert_cramped("msup-012", false, "superscript");
-      }, "child of msup, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("msubsup-011", false, "base");
-          assert_cramped("msubsup-012", true, "subscript");
-          assert_cramped("msubsup-013", false, "superscript");
-      }, "child of msubsup, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("munder-011", false, "base");
-          assert_cramped("munder-012", true, "underscript");
-      }, "child of munder, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mover-011", false, "base");
-          assert_cramped("mover-012", false, "non-accent overscript");
-      }, "child of mover, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("munderover-011", false, "base");
-          assert_cramped("munderover-012", true, "underscript");
-          assert_cramped("munderover-013", false, "non-accent overscript");
-      }, "child of munderover, from in-flow children");
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("mover-013", false, "accent overscript");
-          assert_cramped("mover-014", false, "accent superscript");
-      }, "accent child of mover, from in-flow children");
-
-
-      test(function() {
-          assert_true(MathMLFeatureDetection.has_mspace());
-          assert_cramped("munderover-014", false, "accent overscript");
-          assert_cramped("munderover-015", false, "accent superscript");
-      }, "accent child of munderover, from in-flow children");
+          assert_cramped("mmultiscripts-001", false, "base");
+          assert_cramped("mmultiscripts-002", true, "post-subscript");
+          assert_cramped("mmultiscripts-003", false, "post-superscript");
+          assert_cramped("mmultiscripts-004", true, "pre-subscript");
+          assert_cramped("mmultiscripts-005", false, "post-superscript");
+      }, "mmultiscripts");
 
       done();
   }
@@ -456,18 +382,18 @@
   <p>
     <math>
       <mover accent="true" id="mover-003">
-        <mn>0</mn>
         <msup class="testedElement">
           <mspace height="2em" width="2em"/>
           <mspace height="1em" width="1em"/>
         </msup>
+        <mn>1</mn>
       </mover>
     </math>
   </p>
   <p>
     <math>
       <mover accent="true" id="mover-004">
-        <mo movablelimits="true">0</mo>
+        <mn>0</mn>
         <msup class="testedElement">
           <mspace height="2em" width="2em"/>
           <mspace height="1em" width="1em"/>
@@ -514,19 +440,31 @@
   <p>
     <math>
       <munderover accent="true" id="munderover-004">
-        <mn>0</mn>
-        <mn>1</mn>
         <msup class="testedElement">
           <mspace height="2em" width="2em"/>
           <mspace height="1em" width="1em"/>
         </msup>
+        <mn>1</mn>
+        <mn>2</mn>
       </munderover>
     </math>
   </p>
   <p>
     <math>
       <munderover accent="true" id="munderover-005">
-        <mo movablelimits="true">0</mo>
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover accent="true" id="munderover-006">
+        <mn>0</mn>
         <mn>1</mn>
         <msup class="testedElement">
           <mspace height="2em" width="2em"/>
@@ -535,559 +473,119 @@
       </munderover>
     </math>
   </p>
-
   <p>
-    <math id="math-011">
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msup class="testedElement">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mspace height="2em" width="2em"/>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mspace height="1em" width="1em"/>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
     <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mrow id="mrow-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts id="mmultiscripts-001">
         <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
           <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
           <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mrow>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msqrt>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <!-- This is a child of a msqrt so it is cramped. As a consequence,
-             all its descendants are cramped too. -->
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <munderover>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mover>
-            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-            <munder>
-              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-              <msubsup>
-                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                <msup>
-                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                  <msub>
-                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                    <mfrac>
-                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                      <mrow id="mrow-012">
-                        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                        <msup class="testedElement">
-                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                          <mspace height="2em" width="2em"/>
-                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                          <mspace height="1em" width="1em"/>
-                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                        </msup>
-                        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                      </mrow>
-                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                      <mspace/>
-                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                    </mfrac>
-                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                    <mspace/>
-                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                  </msub>
-                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                  <mspace/>
-                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                </msup>
-                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                <mspace/>
-                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-                <mspace/>
-                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-              </msubsup>
-              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-              <mspace/>
-              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-            </munder>
-            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-            <mspace/>
-            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          </mover>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </munderover>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msqrt>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msqrt id="msqrt-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>2</mn>
         <mn>3</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>4</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msqrt>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>5</mn>
+        <mn>6</mn>
+        <mprescripts/>
+        <mn>7</mn>
+        <mn>8</mn>
+        <mn>9</mn>
+        <mn>10</mn>
+        <mn>11</mn>
+        <mn>12</mn>
+      </mmultiscripts>
     </math>
   </p>
   <p>
     <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mroot id="mroot-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts id="mmultiscripts-002">
         <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mroot>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mroot id="mroot-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mroot>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mfrac id="mfrac-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mfrac>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mfrac id="mfrac-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mfrac>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msub id="msub-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msub>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msub id="msub-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msub>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msup id="msup-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msup id="msup-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msubsup id="msubsup-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>2</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msubsup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>4</mn>
+        <mn>5</mn>
+        <mn>6</mn>
+        <mprescripts/>
+        <mn>7</mn>
+        <mn>8</mn>
+        <mn>9</mn>
+        <mn>10</mn>
+        <mn>11</mn>
+        <mn>12</mn>
+      </mmultiscripts>
     </math>
   </p>
   <p>
     <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msubsup id="msubsup-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts id="mmultiscripts-003">
         <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
         <mn>2</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msubsup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>3</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>5</mn>
+        <mn>6</mn>
+        <mprescripts/>
+        <mn>7</mn>
+        <mn>8</mn>
+        <mn>9</mn>
+        <mn>10</mn>
+        <mn>11</mn>
+        <mn>12</mn>
+      </mmultiscripts>
     </math>
   </p>
   <p>
     <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <msubsup id="msubsup-013">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts id="mmultiscripts-004">
         <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </msubsup>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munder id="munder-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munder>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munder id="munder-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munder>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mover id="mover-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mover id="mover-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mover accent="true" id="mover-013">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <mover accent="true" id="mover-014">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mo movablelimits="true">0</mo>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </mover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munderover id="munderover-011">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>2</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munderover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>3</mn>
+        <mn>4</mn>
+        <mn>5</mn>
+        <mn>6</mn>
+        <mprescripts/>
+        <mn>7</mn>
+        <mn>8</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>10</mn>
+        <mn>11</mn>
+        <mn>12</mn>
+      </mmultiscripts>
     </math>
   </p>
   <p>
     <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munderover id="munderover-012">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts id="mmultiscripts-005">
         <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
         <mn>2</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munderover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munderover id="munderover-013">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>3</mn>
+        <mn>4</mn>
+        <mn>5</mn>
+        <mn>6</mn>
+        <mprescripts/>
+        <mn>7</mn>
+        <mn>8</mn>
+        <mn>9</mn>
         <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
           <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
           <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munderover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munderover accent="true" id="munderover-014">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>0</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munderover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-    </math>
-  </p>
-  <p>
-    <math>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      <munderover accent="true" id="munderover-015">
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mo movablelimits="true">0</mo>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <mn>1</mn>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        <msup class="testedElement">
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="2em" width="2em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-          <mspace height="1em" width="1em"/>
-          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-        </msup>
-        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
-      </munderover>
-      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>11</mn>
+        <mn>12</mn>
+      </mmultiscripts>
     </math>
   </p>
 </body>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html
index bc4b17730c9..a80fade2de6 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
 <meta charset="utf-8">
 <title>color</title>
@@ -16,6 +16,19 @@
     <math><mo style="color: green">3</mo></math>
     <math><mtext style="color: green">4</mtext></math>
     <math><ms style="color: green">5</ms></math>
+    <div id="dynamic">
+      <math><mi>1</mi></math>
+      <math><mn>2</mn></math>
+      <math><mo>3</mo></math>
+      <math><mtext>4</mtext></math>
+      <math><ms>5</ms></math>
+    </div>
   </div>
+  <script>
+    window.addEventListener("load", () => {
+        document.getElementById("dynamic").style.color = "green";
+        document.documentElement.classList.remove("reftest-wait");
+    });
+  </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html
index 177333830e5..b7458bd6962 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
 <meta charset="utf-8">
 <title>color</title>
@@ -13,7 +13,16 @@
   <p>Test passes if you see a green square.</p>
   <div style="background: green; color: red; width: 200px; height: 200px; padding: 1px;">
     <math><mfrac style="color: green"><mn>1</mn><mn>2</mn></mfrac></math>
+    <div id="dynamic">
+      <math><mfrac><mn>1</mn><mn>2</mn></mfrac></math>
+    </div>
   </div>
+  <script>
+    window.addEventListener("load", () => {
+        document.getElementById("dynamic").style.color = "green";
+        document.documentElement.classList.remove("reftest-wait");
+    });
+  </script>
   <script src="/mathml/support/feature-detection.js"></script>
   <script>MathMLFeatureDetection.ensure_for_match_reftest("has_mfrac");</script>
 </body>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html
index 2422ffdf09f..3166de14a8e 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
 <meta charset="utf-8">
 <title>color</title>
@@ -14,7 +14,17 @@
   <div style="background: green; color: red; width: 200px; height: 200px; padding: 1px;">
     <math><msqrt style="color: green"><mn>1</mn></msqrt></math>
     <math><mroot style="color: green"><mn>2</mn><mn>2</mn></mroot></math>
+    <div id="dynamic">
+      <math><msqrt><mn>1</mn></msqrt></math>
+      <math><mroot><mn>2</mn><mn>2</mn></mroot></math>
+    </div>
   </div>
+  <script>
+    window.addEventListener("load", () => {
+        document.getElementById("dynamic").style.color = "green";
+        document.documentElement.classList.remove("reftest-wait");
+    });
+  </script>
   <script src="/mathml/support/feature-detection.js"></script>
   <script>MathMLFeatureDetection.ensure_for_match_reftest("has_msqrt");</script>
 </body>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.html
index 65f6c4469ad..251cd0530fb 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
 <meta charset="utf-8">
 <title>color</title>
@@ -26,7 +26,29 @@
     <math><menclose notation="downdiagonalstrike" style="color: green"><mn>12</mn></menclose></math>
     <math><menclose notation="longdiv" style="color: green"><mn>13</mn></menclose></math>
     <math><menclose notation="circle" style="color: green"><mn>14</mn></menclose></math>
+    <div id="dynamic">
+      <math><menclose notation="left"><mn>1</mn></menclose></math>
+      <math><menclose notation="right"><mn>2</mn></menclose></math>
+      <math><menclose notation="top"><mn>3</mn></menclose></math>
+      <math><menclose notation="bottom"><mn>4</mn></menclose></math>
+      <math><menclose notation="box"><mn>5</mn></menclose></math>
+      <math><menclose notation="roundedbox"><mn>6</mn></menclose></math>
+      <math><menclose notation="actuarial"><mn>7</mn></menclose></math>
+      <math><menclose notation="madruwb"><mn>8</mn></menclose></math>
+      <math><menclose notation="horizontalstrike"><mn>9</mn></menclose></math>
+      <math><menclose notation="verticalstrike"><mn>10</mn></menclose></math>
+      <math><menclose notation="updiagonalstrike"><mn>11</mn></menclose></math>
+      <math><menclose notation="downdiagonalstrike"><mn>12</mn></menclose></math>
+      <math><menclose notation="longdiv"><mn>13</mn></menclose></math>
+      <math><menclose notation="circle"><mn>14</mn></menclose></math>
+    </div>
   </div>
+  <script>
+    window.addEventListener("load", () => {
+        document.getElementById("dynamic").style.color = "green";
+        document.documentElement.classList.remove("reftest-wait");
+    });
+  </script>
   <script src="/mathml/support/feature-detection.js"></script>
   <script>MathMLFeatureDetection.ensure_for_match_reftest("has_menclose");</script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-event/free-fall-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/free-fall-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/free-fall-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/motion/free-fall-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/screen-upmost-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/screen-upmost-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/screen-upmost-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/motion/screen-upmost-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/screen-upright-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/screen-upright-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/screen-upright-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/motion/screen-upright-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t025-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/t025-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t025-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/motion/t025-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t028-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/t028-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t028-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/motion/t028-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/deviceorientationabsoluteevent.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
similarity index 92%
rename from tests/wpt/web-platform-tests/orientation-event/deviceorientationabsoluteevent.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
index 8371098a194..e63783f6cf4 100644
--- a/tests/wpt/web-platform-tests/orientation-event/deviceorientationabsoluteevent.https.html
+++ b/tests/wpt/web-platform-tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
@@ -16,7 +16,7 @@
         if (!run) {
           run = true;
           t.step(function () {
-            assert_true(e instanceof DeviceOrientationEvent, "instanceof DeviceOrientationEvent");
+            assert_true(e instanceof DeviceOrientationEvent);
             assert_equals(e.type, "deviceorientationabsolute", "type is set to \"deviceorientationabsolute\"");
             assert_equals(e.alpha, null, "alpha is set to null");
             assert_equals(e.beta, null, "beta is set to null");
diff --git a/tests/wpt/web-platform-tests/orientation-event/horizontal-surface-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/horizontal-surface-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/horizontal-surface-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/horizontal-surface-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t006-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/t006-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t006-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/t006-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t009-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/t009-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t009-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/t009-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t010-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/t010-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t010-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/t010-manual.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-event/t012-manual.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/t012-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/orientation-event/t012-manual.https.html
rename to tests/wpt/web-platform-tests/orientation-event/orientation/t012-manual.https.html
diff --git a/tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js b/tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js
index 585bda92dce..32efebe98ff 100644
--- a/tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js
+++ b/tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js
@@ -6,46 +6,20 @@
 
 'use strict';
 
-promise_test(async t => {
-  const observe = new Promise((resolve, reject) => {
-    try {
-      self.observer = new PerformanceObserver((entries, observer) => {
-        self.entryList = entries;
-        self.mark = entries.getEntries()[0];
-        resolve();
-      });
+idl_test(
+  ['performance-timeline'],
+  ['hr-time', 'dom'],
+  async idl_array => {
+    idl_array.add_objects({
+      Performance: ['performance'],
+      PerformanceObserver: ['observer'],
+      PerformanceObserverEntryList: ['entryList'],
+    });
+
+    self.entryList = await new Promise((resolve, reject) => {
+      self.observer = new PerformanceObserver(resolve);
       observer.observe({ entryTypes: ['mark'] });
       performance.mark('test');
-    } catch (e) {
-      reject(e);
-    }
-  });
-  const timeout = new Promise((_, reject) => {
-    t.step_timeout(() => reject('Timed out waiting for observation'), 3000);
-  });
-  const user = await fetch('/interfaces/user-timing.idl').then(r => r.text());
-  const execute_test = () => {
-    idl_test(
-      ['performance-timeline'],
-      ['hr-time', 'dom'],
-      idl_array => {
-        idl_array.add_idls(user, {only: ['PerformanceMark']});
-        idl_array.add_objects({
-          Performance: ['performance'],
-          // NOTE: PerformanceMark cascadingly tests PerformanceEntry
-          PerformanceMark: ['mark'],
-          PerformanceObserver: ['observer'],
-          PerformanceObserverEntryList: ['entryList'],
-        });
-      }
-    );
-  };
-
-  return Promise.race([observe, timeout]).then(
-    execute_test,
-    reason => {
-      execute_test();
-      return Promise.reject(reason);
-    }
-  );
-})
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html
index a56dc409320..773b06e5043 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html
@@ -68,6 +68,9 @@ function assert_rect_approx_equals(rect, expected, epsilon) {
   assert_approx_equals(rect.height, expected.height, epsilon, "height");
 }
 
+test(function() {
+  assert_rect_approx_equals(document.createElementNS("http://www.w3.org/2000/svg", "rect").getBBox(), {"x":0, "y":0, "width":0, "height":0 }, EPSILON);
+}, "getBBox on detached element");
 test(function() {
   assert_rect_approx_equals(document.getElementById("p1").getBBox(), {"x":0, "y":0, "width":0, "height":0 }, EPSILON);
 }, "getBBox on polygon with no points attribute");
diff --git a/tests/wpt/web-platform-tests/tools/ci/manifest_build.py b/tests/wpt/web-platform-tests/tools/ci/manifest_build.py
index 1e388dfa741..20f96d9a3ee 100644
--- a/tests/wpt/web-platform-tests/tools/ci/manifest_build.py
+++ b/tests/wpt/web-platform-tests/tools/ci/manifest_build.py
@@ -84,8 +84,7 @@ def request(url, desc, method=None, data=None, json_data=None, params=None, head
     try:
         return resp.json()
     except ValueError:
-        logger.error("%s failed: Returned data was not JSON Response:" %
-                     (desc, resp.status_code))
+        logger.error("%s failed: Returned data was not JSON Response:" % desc)
         logger.error(resp.text)
 
 
diff --git a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
index 1c4fb7262e5..2a4c7e5d7b2 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
@@ -1,4 +1,4 @@
 flake8==3.7.9
 pycodestyle==2.5.0
-pyflakes==2.1.1
+pyflakes==2.2.0
 pep8-naming==0.10.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index 5524d70bc71..45692a0488b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -372,8 +372,8 @@ class SeleniumRefTestExecutor(RefTestExecutor):
         self.close_after_done = close_after_done
         self.has_window = False
 
-        with open(os.path.join(here, "test-wait.js" % {"classname": "reftest-wait"})) as f:
-            self.wait_script = f.read()
+        with open(os.path.join(here, "test-wait.js")) as f:
+            self.wait_script = f.read() % {"classname": "reftest-wait"}
 
     def reset(self):
         self.implementation.reset()
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
index f6701da3405..425f40223f7 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
@@ -235,8 +235,8 @@ class ServoWebDriverRefTestExecutor(RefTestExecutor):
                                                capabilities=capabilities)
         self.implementation = RefTestImplementation(self)
         self.timeout = None
-        with open(os.path.join(here, "reftest-wait_webdriver.js")) as f:
-            self.wait_script = f.read()
+        with open(os.path.join(here, "test-wait.js")) as f:
+            self.wait_script = f.read() % {"classname": "reftest-wait"}
 
     def reset(self):
         self.implementation.reset()
diff --git a/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini b/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
deleted file mode 100644
index b884c61ff2a..00000000000
--- a/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[out-of-bounds-uniform-array-access.html]
-  expected:
-    if os == "linux": TIMEOUT
-  [Overall test]
-    expected:
-      if os == "linux": NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 9c96659618a..dd299c6c0c2 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -41,3 +41,45 @@
   [WebGL test #41: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,0,0]
     expected: FAIL
 
+  [WebGL test #39: attachment 2 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,0,0]
+    expected: FAIL
+
+  [WebGL test #52: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #42: attachment 5 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #50: attachment 5 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #51: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #47: attachment 2 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,0,0]
+    expected: FAIL
+
+  [WebGL test #41: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,255,0]
+    expected: FAIL
+
+  [WebGL test #43: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #46: attachment 1 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,255,0]
+    expected: FAIL
+
+  [WebGL test #38: attachment 1 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #48: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,255,0]
+    expected: FAIL
+
+  [WebGL test #49: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,255,0]
+    expected: FAIL
+
+  [WebGL test #40: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,255,0]
+    expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/rgb-format-support.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/rgb-format-support.html.ini
index 787a9347164..b0419bf05ee 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/rgb-format-support.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/rgb-format-support.html.ini
@@ -23,3 +23,12 @@
     expected:
       if os == "mac": FAIL
 
+  [WebGL test #15: getError expected: NO_ERROR. Was INVALID_FRAMEBUFFER_OPERATION : should be no errors from clear()]
+    expected: FAIL
+
+  [WebGL test #14: framebuffer with texture is incomplete]
+    expected: FAIL
+
+  [WebGL test #13: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors from texture setup]
+    expected: FAIL
+