From 1f25a2972a5978558f2b196b0755e3dd28a40fc5 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Wed, 27 May 2015 22:42:17 +0100
Subject: [PATCH] Update CSS tests expected data to revision
 31d63cc79bd4c929ed582229e936d7b389f3e6ab

---
 .../css21_dev/html4/absolute-non-replaced-height-006.htm.ini   | 3 ---
 .../css21_dev/html4/absolute-replaced-height-001.htm.ini       | 3 ---
 .../css21_dev/html4/absolute-replaced-height-005.htm.ini       | 2 +-
 .../css21_dev/html4/absolute-replaced-height-012.htm.ini       | 2 +-
 .../css21_dev/html4/absolute-replaced-height-019.htm.ini       | 2 +-
 .../css21_dev/html4/absolute-replaced-height-026.htm.ini       | 2 +-
 .../css21_dev/html4/absolute-replaced-height-033.htm.ini       | 2 +-
 .../css21_dev/html4/absolute-replaced-width-001.htm.ini        | 3 ---
 .../css21_dev/html4/absolute-replaced-width-008.htm.ini        | 3 ---
 .../css21_dev/html4/absolute-replaced-width-029.htm.ini        | 3 +++
 .../css21_dev/html4/absolute-replaced-width-043.htm.ini        | 3 +++
 .../css21_dev/html4/absolute-replaced-width-057.htm.ini        | 3 +++
 .../css21_dev/html4/{abspos-019.htm.ini => abspos-007.htm.ini} | 2 +-
 .../html4/abspos-containing-block-initial-004e.htm.ini         | 2 +-
 ...ttachment-009.htm.ini => after-content-display-014.htm.ini} | 2 +-
 .../css21_dev/html4/background-repeat-repeat-x.htm.ini         | 3 ---
 .../css21_dev/html4/background-repeat-repeat-y.htm.ini         | 3 ---
 .../css21_dev/html4/before-content-display-014.htm.ini         | 3 +++
 .../{bottom-offset-001.htm.ini => bidi-box-model-001.htm.ini}  | 2 +-
 .../metadata-css/css21_dev/html4/bidi-box-model-002.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/bidi-box-model-004.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/bidi-box-model-005.htm.ini    | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini | 2 +-
 .../css21_dev/html4/block-in-inline-append-001.htm.ini         | 3 ---
 .../css21_dev/html4/block-in-inline-margins-002a.htm.ini       | 3 ---
 .../css21_dev/html4/block-in-inline-margins-002b.htm.ini       | 3 ---
 .../css21_dev/html4/block-non-replaced-width-004.htm.ini       | 3 +++
 .../css21_dev/html4/block-replaced-height-004.htm.ini          | 2 +-
 .../css21_dev/html4/block-replaced-height-007.htm.ini          | 2 +-
 .../metadata-css/css21_dev/html4/border-applies-to-009.htm.ini | 3 ---
 .../metadata-css/css21_dev/html4/border-applies-to-012.htm.ini | 3 ---
 .../metadata-css/css21_dev/html4/border-applies-to-014.htm.ini | 3 ---
 .../metadata-css/css21_dev/html4/border-applies-to-015.htm.ini | 3 ---
 .../css21_dev/html4/border-bottom-applies-to-001.htm.ini       | 3 +++
 .../css21_dev/html4/border-bottom-applies-to-002.htm.ini       | 3 +++
 .../css21_dev/html4/border-bottom-applies-to-003.htm.ini       | 3 +++
 .../css21_dev/html4/border-bottom-color-applies-to-001.htm.ini | 3 +++
 .../css21_dev/html4/border-bottom-color-applies-to-002.htm.ini | 3 +++
 .../css21_dev/html4/border-bottom-color-applies-to-003.htm.ini | 3 +++
 .../css21_dev/html4/border-bottom-width-applies-to-001.htm.ini | 3 +++
 .../css21_dev/html4/border-bottom-width-applies-to-002.htm.ini | 3 +++
 .../css21_dev/html4/border-bottom-width-applies-to-003.htm.ini | 3 +++
 .../css21_dev/html4/border-collapse-dynamic-cell-001.htm.ini   | 3 ---
 .../css21_dev/html4/border-collapse-dynamic-cell-005.htm.ini   | 3 ---
 .../html4/border-collapse-dynamic-colgroup-001.htm.ini         | 3 +++
 .../html4/border-collapse-dynamic-colgroup-002.htm.ini         | 3 +++
 .../html4/border-collapse-dynamic-colgroup-003.htm.ini         | 3 +++
 .../css21_dev/html4/border-collapse-dynamic-column-001.htm.ini | 2 +-
 .../css21_dev/html4/border-collapse-dynamic-column-002.htm.ini | 3 +++
 .../css21_dev/html4/border-collapse-dynamic-column-003.htm.ini | 2 +-
 .../html4/border-collapse-dynamic-rowgroup-001.htm.ini         | 3 ---
 .../html4/border-collapse-dynamic-rowgroup-002.htm.ini         | 3 ---
 .../html4/border-collapse-dynamic-rowgroup-003.htm.ini         | 3 ---
 .../css21_dev/html4/border-collapse-dynamic-table-001.htm.ini  | 2 +-
 .../css21_dev/html4/border-collapse-dynamic-table-002.htm.ini  | 3 +++
 .../css21_dev/html4/border-collapse-dynamic-table-003.htm.ini  | 2 +-
 .../css21_dev/html4/border-color-applies-to-009.htm.ini        | 3 ---
 .../css21_dev/html4/border-color-applies-to-012.htm.ini        | 3 ---
 .../css21_dev/html4/border-color-applies-to-014.htm.ini        | 3 ---
 .../css21_dev/html4/border-color-applies-to-015.htm.ini        | 3 ---
 .../css21_dev/html4/border-left-applies-to-004.htm.ini         | 3 +++
 .../css21_dev/html4/border-left-color-applies-to-004.htm.ini   | 3 +++
 .../css21_dev/html4/border-left-width-applies-to-004.htm.ini   | 3 +++
 .../css21_dev/html4/border-right-width-095.htm.ini             | 3 ---
 .../css21_dev/html4/border-top-applies-to-004.htm.ini          | 3 +++
 .../css21_dev/html4/border-top-color-applies-to-004.htm.ini    | 3 +++
 .../css21_dev/html4/border-top-width-applies-to-004.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/bottom-applies-to-013.htm.ini | 2 +-
 .../metadata-css/css21_dev/html4/bottom-applies-to-014.htm.ini | 2 +-
 .../wpt/metadata-css/css21_dev/html4/bottom-offset-002.htm.ini | 3 ---
 .../wpt/metadata-css/css21_dev/html4/bottom-offset-003.htm.ini | 3 ---
 .../{border-left-018.htm.ini => c414-flt-fit-002.htm.ini}      | 2 +-
 .../{clear-float-003.htm.ini => c414-flt-fit-003.htm.ini}      | 2 +-
 .../wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini  | 3 +++
 .../metadata-css/css21_dev/html4/clear-applies-to-009.htm.ini  | 3 ---
 ...onymous-boxes-001b.htm.ini => clear-applies-to-012.htm.ini} | 2 +-
 .../metadata-css/css21_dev/html4/clear-applies-to-013.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/clear-applies-to-016.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/clear-applies-to-017.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/containing-block-008.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/containing-block-010.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/containing-block-030.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/content-173.htm.ini     | 3 ---
 ...background-root-103.htm.ini => content-inherit-002.htm.ini} | 2 +-
 .../html4/delete-block-in-inlines-beginning-001.htm.ini        | 3 +++
 .../css21_dev/html4/delete-block-in-inlines-end-001.htm.ini    | 3 +++
 .../css21_dev/html4/delete-block-in-inlines-middle-001.htm.ini | 3 +++
 .../html4/delete-inline-in-blocks-beginning-001.htm.ini        | 3 +++
 .../css21_dev/html4/delete-inline-in-blocks-end-001.htm.ini    | 3 +++
 .../css21_dev/html4/delete-inline-in-blocks-middle-001.htm.ini | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/direction-002.htm.ini   | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/direction-003.htm.ini   | 3 ---
 .../css21_dev/html4/dynamic-top-change-002.htm.ini             | 3 ---
 .../css21_dev/html4/dynamic-top-change-003.htm.ini             | 3 ---
 .../metadata-css/css21_dev/html4/first-line-floats-004.htm.ini | 3 ---
 .../metadata-css/css21_dev/html4/float-applies-to-001.htm.ini  | 3 +++
 .../metadata-css/css21_dev/html4/float-applies-to-002.htm.ini  | 3 +++
 .../metadata-css/css21_dev/html4/float-applies-to-003.htm.ini  | 3 +++
 .../css21_dev/html4/float-replaced-height-005.htm.ini          | 2 +-
 .../css21_dev/html4/{abspos-020.htm.ini => floats-041.htm.ini} | 2 +-
 .../css21_dev/html4/{height-006.htm.ini => floats-145.htm.ini} | 2 +-
 .../css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm.ini  | 3 ---
 .../css21_dev/html4/floats-wrap-bfc-001-left-table.htm.ini     | 3 ---
 .../css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm.ini | 3 ---
 .../css21_dev/html4/floats-wrap-bfc-001-right-table.htm.ini    | 3 ---
 .../css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm.ini  | 3 ---
 .../css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-007.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-017.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-018.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-028.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-029.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-039.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-040.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-050.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-051.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-061.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-062.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-072.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-073.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-094.htm.ini      | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/height-095.htm.ini      | 3 ---
 .../css21_dev/html4/inline-block-replaced-height-005.htm.ini   | 2 +-
 .../css21_dev/html4/inline-block-width-002a.htm.ini            | 3 ---
 .../css21_dev/html4/inline-block-zorder-003.htm.ini            | 3 ---
 .../css21_dev/html4/inline-formatting-context-023.htm.ini      | 2 +-
 .../css21_dev/html4/inline-replaced-height-005.htm.ini         | 3 ---
 .../html4/insert-block-in-inlines-beginning-001.htm.ini        | 3 +++
 .../css21_dev/html4/insert-block-in-inlines-end-001.htm.ini    | 3 +++
 .../css21_dev/html4/insert-block-in-inlines-middle-001.htm.ini | 3 +++
 .../html4/insert-inline-in-blocks-beginning-001.htm.ini        | 3 +++
 .../css21_dev/html4/insert-inline-in-blocks-end-001.htm.ini    | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-begin-001.htm.ini  | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-begin-002.htm.ini  | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-begin-003.htm.ini  | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-end-001.htm.ini    | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-end-002.htm.ini    | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-end-003.htm.ini    | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-middle-001.htm.ini | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-middle-002.htm.ini | 3 +++
 .../html4/insert-inline-in-blocks-n-inlines-middle-003.htm.ini | 3 +++
 .../metadata-css/css21_dev/html4/left-applies-to-005.htm.ini   | 3 ---
 .../metadata-css/css21_dev/html4/left-applies-to-006.htm.ini   | 3 ---
 .../metadata-css/css21_dev/html4/left-applies-to-007.htm.ini   | 3 ---
 .../metadata-css/css21_dev/html4/left-applies-to-013.htm.ini   | 2 +-
 .../metadata-css/css21_dev/html4/left-applies-to-014.htm.ini   | 2 +-
 .../metadata-css/css21_dev/html4/left-applies-to-015.htm.ini   | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/left-offset-001.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/left-offset-002.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/left-offset-003.htm.ini | 3 ---
 .../css21_dev/html4/left-offset-percentage-001.htm.ini         | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-006.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-007.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-017.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-018.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-028.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-029.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-039.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-040.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-050.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-051.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-061.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-062.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-069.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-072.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-073.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-094.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-095.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-102.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-105.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-106.htm.ini | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/line-height-112.htm.ini | 3 ---
 .../css21_dev/html4/margin-border-padding-002.htm.ini          | 3 ---
 ...background-root-102.htm.ini => margin-collapse-004.htm.ini} | 2 +-
 .../metadata-css/css21_dev/html4/margin-collapse-008.htm.ini   | 3 ---
 .../metadata-css/css21_dev/html4/margin-collapse-014.htm.ini   | 3 ---
 .../metadata-css/css21_dev/html4/margin-collapse-019.htm.ini   | 3 ---
 .../wpt/metadata-css/css21_dev/html4/margin-right-008.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-019.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-020.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-031.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-032.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-043.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-044.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-055.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-056.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-067.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-068.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-079.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-080.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-103.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-104.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/margin-right-113.htm.ini  | 3 +++
 .../css21_dev/html4/margin-right-applies-to-012.htm.ini        | 3 ---
 .../css21_dev/html4/margin-top-applies-to-012.htm.ini          | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-006.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-007.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-017.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-018.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-028.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-029.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-039.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-040.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-050.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-051.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-061.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-062.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-072.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-073.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-094.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-095.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-107.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/max-height-110.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-006.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-007.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-017.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-018.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-028.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-029.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-039.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-040.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-050.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-051.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-061.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-062.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-072.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-073.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-094.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-095.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-104.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-105.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/min-height-106.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/padding-005.htm.ini     | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/padding-006.htm.ini     | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/padding-007.htm.ini     | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/padding-008.htm.ini     | 3 ---
 .../css21_dev/html4/padding-right-applies-to-012.htm.ini       | 3 ---
 .../css21_dev/html4/padding-right-applies-to-014.htm.ini       | 3 +++
 .../css21_dev/html4/position-applies-to-013.htm.ini            | 2 +-
 .../css21_dev/html4/position-applies-to-014.htm.ini            | 2 +-
 .../metadata-css/css21_dev/html4/position-fixed-001.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/position-relative-035.htm.ini | 3 ---
 .../wpt/metadata-css/css21_dev/html4/relpos-calcs-001.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/relpos-calcs-002.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/relpos-calcs-004.htm.ini  | 3 +++
 .../wpt/metadata-css/css21_dev/html4/relpos-calcs-005.htm.ini  | 3 +++
 .../css21_dev/html4/{floats-139.htm.ini => right-007.htm.ini}  | 2 +-
 tests/wpt/metadata-css/css21_dev/html4/right-008.htm.ini       | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/right-031.htm.ini       | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/right-032.htm.ini       | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/right-079.htm.ini       | 3 +++
 tests/wpt/metadata-css/css21_dev/html4/right-080.htm.ini       | 3 +++
 .../metadata-css/css21_dev/html4/right-applies-to-005.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/right-applies-to-006.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/right-applies-to-007.htm.ini  | 3 ---
 .../metadata-css/css21_dev/html4/right-applies-to-013.htm.ini  | 2 +-
 .../metadata-css/css21_dev/html4/right-applies-to-014.htm.ini  | 2 +-
 .../metadata-css/css21_dev/html4/right-applies-to-015.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/right-offset-001.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/right-offset-002.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/right-offset-003.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/run-in-basic-015.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini  | 3 ---
 .../css21_dev/html4/run-in-block-between-002.htm.ini           | 3 ---
 .../css21_dev/html4/run-in-display-none-between-003.htm.ini    | 3 +++
 .../css21_dev/html4/run-in-inline-block-between-002.htm.ini    | 3 ---
 .../css21_dev/html4/run-in-inline-table-between-002.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/run-in-restyle-002.htm.ini    | 3 ---
 .../css21_dev/html4/run-in-run-in-between-008.htm.ini          | 3 ---
 .../css21_dev/html4/run-in-table-cell-between-001.htm.ini      | 3 +++
 .../css21_dev/html4/run-in-table-cell-between-002.htm.ini      | 3 +++
 ...ound-bg-pos-204.htm.ini => run-in-text-between-003.htm.ini} | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-cell-001.htm.ini      | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-colgroup-001.htm.ini  | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-column-001.htm.ini    | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-row-001.htm.ini       | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-rowgroup-001.htm.ini  | 2 +-
 .../css21_dev/html4/table-backgrounds-bc-table-001.htm.ini     | 2 +-
 .../metadata-css/css21_dev/html4/top-applies-to-002.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/top-applies-to-003.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/top-applies-to-004.htm.ini    | 3 +++
 .../metadata-css/css21_dev/html4/top-applies-to-005.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/top-applies-to-006.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/top-applies-to-007.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/top-applies-to-013.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/top-applies-to-014.htm.ini    | 3 ---
 .../metadata-css/css21_dev/html4/top-applies-to-015.htm.ini    | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/top-offset-001.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/top-offset-002.htm.ini  | 3 ---
 tests/wpt/metadata-css/css21_dev/html4/top-offset-003.htm.ini  | 3 ---
 .../wpt/metadata-css/css21_dev/html4/unicode-bidi-001.htm.ini  | 3 ---
 .../css21_dev/html4/vertical-align-sub-001.htm.ini             | 3 ---
 .../css21_dev/html4/vertical-align-super-001.htm.ini           | 3 ---
 293 files changed, 288 insertions(+), 549 deletions(-)
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-height-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-008.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-029.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-043.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-057.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{abspos-019.htm.ini => abspos-007.htm.ini} (66%)
 rename tests/wpt/metadata-css/css21_dev/html4/{background-attachment-009.htm.ini => after-content-display-014.htm.ini} (50%)
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{bottom-offset-001.htm.ini => bidi-box-model-001.htm.ini} (56%)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/block-in-inline-append-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002a.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002b.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/block-non-replaced-width-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-applies-to-009.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-applies-to-012.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-applies-to-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-applies-to-015.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-005.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-009.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-012.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-015.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-right-width-095.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/bottom-offset-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/bottom-offset-003.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{border-left-018.htm.ini => c414-flt-fit-002.htm.ini} (58%)
 rename tests/wpt/metadata-css/css21_dev/html4/{clear-float-003.htm.ini => c414-flt-fit-003.htm.ini} (58%)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-009.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{anonymous-boxes-001b.htm.ini => clear-applies-to-012.htm.ini} (55%)
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-013.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-016.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/containing-block-008.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/containing-block-010.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/containing-block-030.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/content-173.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{background-root-103.htm.ini => content-inherit-002.htm.ini} (55%)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-beginning-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-end-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-middle-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-beginning-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-end-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-middle-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/direction-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/direction-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/first-line-floats-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/float-applies-to-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/float-applies-to-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/float-applies-to-003.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{abspos-020.htm.ini => floats-041.htm.ini} (66%)
 rename tests/wpt/metadata-css/css21_dev/html4/{height-006.htm.ini => floats-145.htm.ini} (66%)
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-table.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-table.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-018.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-028.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-029.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-039.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-040.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-050.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-051.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-061.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-062.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-072.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-073.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-094.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/height-095.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/inline-block-width-002a.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/inline-replaced-height-005.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-beginning-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-end-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-middle-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-beginning-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-end-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-applies-to-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-applies-to-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-applies-to-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-applies-to-015.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-offset-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-offset-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-offset-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/left-offset-percentage-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-018.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-028.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-029.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-039.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-040.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-050.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-051.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-061.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-062.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-069.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-072.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-073.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-094.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-095.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-102.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-105.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-106.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/line-height-112.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-border-padding-002.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{background-root-102.htm.ini => margin-collapse-004.htm.ini} (55%)
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-collapse-008.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-collapse-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-collapse-019.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-008.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-019.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-020.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-031.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-032.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-043.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-044.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-055.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-056.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-067.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-068.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-079.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-080.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-103.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-104.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-113.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-right-applies-to-012.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-012.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-018.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-028.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-029.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-039.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-040.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-050.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-051.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-061.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-062.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-072.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-073.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-094.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-095.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-107.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/max-height-110.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-018.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-028.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-029.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-039.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-040.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-050.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-051.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-061.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-062.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-072.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-073.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-094.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-095.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-104.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-105.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/min-height-106.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-008.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-012.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/position-fixed-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/position-relative-035.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-004.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-005.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{floats-139.htm.ini => right-007.htm.ini} (66%)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-008.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-031.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-032.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-079.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-080.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-applies-to-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-applies-to-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-applies-to-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-applies-to-015.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-offset-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-offset-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/right-offset-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-basic-015.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-block-between-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-display-none-between-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-inline-block-between-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-inline-table-between-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-restyle-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-run-in-between-008.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini
 rename tests/wpt/metadata-css/css21_dev/html4/{background-bg-pos-204.htm.ini => run-in-text-between-003.htm.ini} (52%)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-013.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-applies-to-015.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-offset-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-offset-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/top-offset-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/unicode-bidi-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/vertical-align-sub-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/vertical-align-super-001.htm.ini

diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-height-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-height-006.htm.ini
deleted file mode 100644
index 1f8c1f60d97..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-height-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-height-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-001.htm.ini
deleted file mode 100644
index 0c28b9b899f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-replaced-height-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-005.htm.ini
index 52cbc6b69c0..23997299280 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-005.htm.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-005.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-012.htm.ini
index 5354bcbea4b..cade2da3396 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-012.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-012.htm.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-012.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-019.htm.ini
index 086f523fdfc..804f73271dd 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-019.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-019.htm.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-019.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-026.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-026.htm.ini
index 282b0d9a264..2c3ca551287 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-026.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-026.htm.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-026.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-033.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-033.htm.ini
index 843fe38c541..f7041a64158 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-033.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-033.htm.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-033.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-001.htm.ini
deleted file mode 100644
index 16427df096f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-replaced-width-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-008.htm.ini
deleted file mode 100644
index c1ae36a6c44..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-replaced-width-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-029.htm.ini
new file mode 100644
index 00000000000..040c1b6daf0
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-029.htm.ini
@@ -0,0 +1,3 @@
+[absolute-replaced-width-029.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-043.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-043.htm.ini
new file mode 100644
index 00000000000..abd76954489
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-043.htm.ini
@@ -0,0 +1,3 @@
+[absolute-replaced-width-043.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-057.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-057.htm.ini
new file mode 100644
index 00000000000..95e6becface
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-width-057.htm.ini
@@ -0,0 +1,3 @@
+[absolute-replaced-width-057.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abspos-007.htm.ini
similarity index 66%
rename from tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/abspos-007.htm.ini
index e899657cbfd..c5f80cca1d2 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/abspos-007.htm.ini
@@ -1,3 +1,3 @@
-[abspos-019.htm]
+[abspos-007.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abspos-containing-block-initial-004e.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abspos-containing-block-initial-004e.htm.ini
index 705f40f7d3d..c2112a850b7 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/abspos-containing-block-initial-004e.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/abspos-containing-block-initial-004e.htm.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-initial-004e.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini
similarity index 50%
rename from tests/wpt/metadata-css/css21_dev/html4/background-attachment-009.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini
index 07c4d9e23aa..ef7d0e22772 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-009.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini
@@ -1,3 +1,3 @@
-[background-attachment-009.htm]
+[after-content-display-014.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
deleted file mode 100644
index c06bdccbb3c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-repeat-repeat-x.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
deleted file mode 100644
index ed4668c8acc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-repeat-repeat-y.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini
new file mode 100644
index 00000000000..c28b769cf95
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini
@@ -0,0 +1,3 @@
+[before-content-display-014.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-001.htm.ini
similarity index 56%
rename from tests/wpt/metadata-css/css21_dev/html4/bottom-offset-001.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-001.htm.ini
index f4adcd0a456..2ade744d5e8 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-001.htm.ini
@@ -1,3 +1,3 @@
-[bottom-offset-001.htm]
+[bidi-box-model-001.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-002.htm.ini
new file mode 100644
index 00000000000..76b39f6d402
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-002.htm.ini
@@ -0,0 +1,3 @@
+[bidi-box-model-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-004.htm.ini
new file mode 100644
index 00000000000..62e4f57ff19
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-004.htm.ini
@@ -0,0 +1,3 @@
+[bidi-box-model-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-005.htm.ini
new file mode 100644
index 00000000000..c858bb8beb7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-box-model-005.htm.ini
@@ -0,0 +1,3 @@
+[bidi-box-model-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
index c7786c737b7..5d19dad8eed 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
@@ -1,3 +1,3 @@
 [bidi-inline-002.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-append-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-append-001.htm.ini
deleted file mode 100644
index 1493da45205..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-append-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-append-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002a.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002a.htm.ini
deleted file mode 100644
index a5ddd973050..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-margins-002a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002b.htm.ini
deleted file mode 100644
index b7a68637ead..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-margins-002b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-margins-002b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-non-replaced-width-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-non-replaced-width-004.htm.ini
new file mode 100644
index 00000000000..dfb8ee4ba75
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/block-non-replaced-width-004.htm.ini
@@ -0,0 +1,3 @@
+[block-non-replaced-width-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-004.htm.ini
index 77d7591b943..9ab922d17e0 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-004.htm.ini
@@ -1,3 +1,3 @@
 [block-replaced-height-004.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-007.htm.ini
index 4e7ca96d91b..81b358f7c4c 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-007.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/block-replaced-height-007.htm.ini
@@ -1,3 +1,3 @@
 [block-replaced-height-007.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-009.htm.ini
deleted file mode 100644
index 405be32ee5e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-applies-to-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-012.htm.ini
deleted file mode 100644
index da8396215bd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-014.htm.ini
deleted file mode 100644
index 37fffd0e2fb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-015.htm.ini
deleted file mode 100644
index cffacf47afa..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-applies-to-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-001.htm.ini
new file mode 100644
index 00000000000..6f21a2323ac
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-001.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-applies-to-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-002.htm.ini
new file mode 100644
index 00000000000..f28eb58daad
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-002.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-applies-to-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-003.htm.ini
new file mode 100644
index 00000000000..fbbf955fd31
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-applies-to-003.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-applies-to-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-001.htm.ini
new file mode 100644
index 00000000000..12818eca534
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-001.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-color-applies-to-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-002.htm.ini
new file mode 100644
index 00000000000..78548733872
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-002.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-color-applies-to-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-003.htm.ini
new file mode 100644
index 00000000000..5b40eb56a4b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-applies-to-003.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-color-applies-to-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-001.htm.ini
new file mode 100644
index 00000000000..f639817ac7b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-001.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-width-applies-to-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-002.htm.ini
new file mode 100644
index 00000000000..fc291cca1d9
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-002.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-width-applies-to-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-003.htm.ini
new file mode 100644
index 00000000000..56f77f0ba8e
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-width-applies-to-003.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-width-applies-to-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-001.htm.ini
deleted file mode 100644
index e0f824aaa2d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-collapse-dynamic-cell-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-005.htm.ini
deleted file mode 100644
index 759a88130a4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-cell-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-collapse-dynamic-cell-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-001.htm.ini
new file mode 100644
index 00000000000..f140eedb72b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-001.htm.ini
@@ -0,0 +1,3 @@
+[border-collapse-dynamic-colgroup-001.htm]
+  type: reftest
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-002.htm.ini
new file mode 100644
index 00000000000..67d4fcd6b14
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-002.htm.ini
@@ -0,0 +1,3 @@
+[border-collapse-dynamic-colgroup-002.htm]
+  type: reftest
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-003.htm.ini
new file mode 100644
index 00000000000..ea32d538745
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-colgroup-003.htm.ini
@@ -0,0 +1,3 @@
+[border-collapse-dynamic-colgroup-003.htm]
+  type: reftest
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-001.htm.ini
index 5891ab46c14..3857d1d79d9 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-001.htm.ini
@@ -1,3 +1,3 @@
 [border-collapse-dynamic-column-001.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-002.htm.ini
new file mode 100644
index 00000000000..255dadecb46
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-002.htm.ini
@@ -0,0 +1,3 @@
+[border-collapse-dynamic-column-002.htm]
+  type: reftest
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-003.htm.ini
index 302235d51db..f4850174a2a 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-column-003.htm.ini
@@ -1,3 +1,3 @@
 [border-collapse-dynamic-column-003.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-001.htm.ini
deleted file mode 100644
index 305eb05b4f8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-collapse-dynamic-rowgroup-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-002.htm.ini
deleted file mode 100644
index 700a17584ee..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-collapse-dynamic-rowgroup-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-003.htm.ini
deleted file mode 100644
index fa948ec59aa..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-rowgroup-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-collapse-dynamic-rowgroup-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-001.htm.ini
index 3751348d3ab..a780b0b90be 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-001.htm.ini
@@ -1,3 +1,3 @@
 [border-collapse-dynamic-table-001.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-002.htm.ini
new file mode 100644
index 00000000000..14411d5217d
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-002.htm.ini
@@ -0,0 +1,3 @@
+[border-collapse-dynamic-table-002.htm]
+  type: reftest
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-003.htm.ini
index e578d933e28..5f65c1334a4 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-collapse-dynamic-table-003.htm.ini
@@ -1,3 +1,3 @@
 [border-collapse-dynamic-table-003.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-009.htm.ini
deleted file mode 100644
index c4722ca5c12..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-color-applies-to-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-012.htm.ini
deleted file mode 100644
index 4237ce4351d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-color-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-014.htm.ini
deleted file mode 100644
index 0219dd8dd33..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-color-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-015.htm.ini
deleted file mode 100644
index 13f6a9687ba..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-color-applies-to-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-004.htm.ini
new file mode 100644
index 00000000000..33c1edd3ed2
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-left-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-004.htm.ini
new file mode 100644
index 00000000000..366584c2505
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-left-color-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-004.htm.ini
new file mode 100644
index 00000000000..1738c9b0873
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-left-width-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-right-width-095.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-right-width-095.htm.ini
deleted file mode 100644
index 4b2815c5ee7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-right-width-095.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-right-width-095.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-004.htm.ini
new file mode 100644
index 00000000000..d81e5f81799
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-top-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-004.htm.ini
new file mode 100644
index 00000000000..df4a61bfa89
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-top-color-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-004.htm.ini
new file mode 100644
index 00000000000..68b41fc3f37
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[border-top-width-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-013.htm.ini
index 48b64fd5884..6c4ccd46693 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-013.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-013.htm.ini
@@ -1,3 +1,3 @@
 [bottom-applies-to-013.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-014.htm.ini
index 16a8931a106..e6954d443dc 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-014.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-014.htm.ini
@@ -1,3 +1,3 @@
 [bottom-applies-to-014.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-002.htm.ini
deleted file mode 100644
index dfd4a110821..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-offset-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-003.htm.ini
deleted file mode 100644
index e8818312d11..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-offset-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-offset-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-002.htm.ini
similarity index 58%
rename from tests/wpt/metadata-css/css21_dev/html4/border-left-018.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-002.htm.ini
index 2a69e7849fb..289f7e06307 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/border-left-018.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-002.htm.ini
@@ -1,3 +1,3 @@
-[border-left-018.htm]
+[c414-flt-fit-002.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/clear-float-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-003.htm.ini
similarity index 58%
rename from tests/wpt/metadata-css/css21_dev/html4/clear-float-003.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-003.htm.ini
index 1fee907fa2e..8fb87cde40d 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-003.htm.ini
@@ -1,3 +1,3 @@
-[clear-float-003.htm]
+[c414-flt-fit-003.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini
new file mode 100644
index 00000000000..8f885773830
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini
@@ -0,0 +1,3 @@
+[c414-flt-fit-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-009.htm.ini
deleted file mode 100644
index b3d85b1bc2a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-applies-to-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/anonymous-boxes-001b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-012.htm.ini
similarity index 55%
rename from tests/wpt/metadata-css/css21_dev/html4/anonymous-boxes-001b.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-012.htm.ini
index 65da53e3723..69faecdc811 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/anonymous-boxes-001b.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-012.htm.ini
@@ -1,3 +1,3 @@
-[anonymous-boxes-001b.htm]
+[clear-applies-to-012.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-013.htm.ini
deleted file mode 100644
index 6d9072738d4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-016.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-016.htm.ini
deleted file mode 100644
index 7d0d42ccdbb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-016.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-applies-to-016.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-017.htm.ini
deleted file mode 100644
index e9a43675ad8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-applies-to-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-applies-to-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/containing-block-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/containing-block-008.htm.ini
deleted file mode 100644
index 757d36a65c2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/containing-block-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[containing-block-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/containing-block-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/containing-block-010.htm.ini
deleted file mode 100644
index ef3399ef22c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/containing-block-010.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[containing-block-010.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/containing-block-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/containing-block-030.htm.ini
deleted file mode 100644
index 4589edcf242..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/containing-block-030.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[containing-block-030.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-173.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-173.htm.ini
deleted file mode 100644
index 292d83d2437..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/content-173.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-173.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-root-103.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-inherit-002.htm.ini
similarity index 55%
rename from tests/wpt/metadata-css/css21_dev/html4/background-root-103.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/content-inherit-002.htm.ini
index 0792c0679d3..2bbd2da84e1 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-root-103.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-inherit-002.htm.ini
@@ -1,3 +1,3 @@
-[background-root-103.htm]
+[content-inherit-002.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-beginning-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-beginning-001.htm.ini
new file mode 100644
index 00000000000..ce42762a80c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-beginning-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-block-in-inlines-beginning-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-end-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-end-001.htm.ini
new file mode 100644
index 00000000000..1f14eadb238
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-end-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-block-in-inlines-end-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-middle-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-middle-001.htm.ini
new file mode 100644
index 00000000000..9b87bf1da02
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-block-in-inlines-middle-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-block-in-inlines-middle-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-beginning-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-beginning-001.htm.ini
new file mode 100644
index 00000000000..21975154b10
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-beginning-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-inline-in-blocks-beginning-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-end-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-end-001.htm.ini
new file mode 100644
index 00000000000..7ea8ee5cd1a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-end-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-inline-in-blocks-end-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-middle-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-middle-001.htm.ini
new file mode 100644
index 00000000000..177751a066b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/delete-inline-in-blocks-middle-001.htm.ini
@@ -0,0 +1,3 @@
+[delete-inline-in-blocks-middle-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/direction-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/direction-002.htm.ini
deleted file mode 100644
index 29c84641848..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/direction-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[direction-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/direction-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/direction-003.htm.ini
deleted file mode 100644
index 4b33e0cda41..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/direction-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[direction-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-002.htm.ini
deleted file mode 100644
index ee9f943adcc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[dynamic-top-change-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-003.htm.ini
deleted file mode 100644
index c55fe498b5b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/dynamic-top-change-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[dynamic-top-change-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-floats-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-floats-004.htm.ini
deleted file mode 100644
index fc7a2d849ec..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/first-line-floats-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[first-line-floats-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-001.htm.ini
new file mode 100644
index 00000000000..cfd50607bfa
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-001.htm.ini
@@ -0,0 +1,3 @@
+[float-applies-to-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-002.htm.ini
new file mode 100644
index 00000000000..864fb0ecb60
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-002.htm.ini
@@ -0,0 +1,3 @@
+[float-applies-to-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-003.htm.ini
new file mode 100644
index 00000000000..0651d31285a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-003.htm.ini
@@ -0,0 +1,3 @@
+[float-applies-to-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-replaced-height-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-replaced-height-005.htm.ini
index 2c55c9b3713..8db147be01d 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/float-replaced-height-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-replaced-height-005.htm.ini
@@ -1,3 +1,3 @@
 [float-replaced-height-005.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-041.htm.ini
similarity index 66%
rename from tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/floats-041.htm.ini
index f631c9486f7..cf50a585b2e 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-041.htm.ini
@@ -1,3 +1,3 @@
-[abspos-020.htm]
+[floats-041.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-145.htm.ini
similarity index 66%
rename from tests/wpt/metadata-css/css21_dev/html4/height-006.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/floats-145.htm.ini
index a89eac3014d..17b0779acd5 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/height-006.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-145.htm.ini
@@ -1,3 +1,3 @@
-[height-006.htm]
+[floats-145.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm.ini
deleted file mode 100644
index 24d76f8efb8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-001-left-overflow.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-table.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-table.htm.ini
deleted file mode 100644
index a6ab2a1103e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-left-table.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-001-left-table.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm.ini
deleted file mode 100644
index d9fecbfd96b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-001-right-overflow.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-table.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-table.htm.ini
deleted file mode 100644
index 50a7935b9f3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-001-right-table.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-001-right-table.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm.ini
deleted file mode 100644
index 1701abd7fd4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-003-left-overflow.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm.ini
deleted file mode 100644
index b00806f400d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-bfc-003-right-overflow.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-007.htm.ini
deleted file mode 100644
index dbe29bbcc7b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-017.htm.ini
deleted file mode 100644
index b5c0f8a6ab9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-018.htm.ini
deleted file mode 100644
index 5f9d7218cd3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-018.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-018.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-028.htm.ini
deleted file mode 100644
index 6302e3ca211..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-028.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-028.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-029.htm.ini
deleted file mode 100644
index d12e266ae8f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-029.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-029.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-039.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-039.htm.ini
deleted file mode 100644
index 46431bfc9d1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-039.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-039.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-040.htm.ini
deleted file mode 100644
index d13304b1853..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-040.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-040.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-050.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-050.htm.ini
deleted file mode 100644
index e3543741db1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-050.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-050.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-051.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-051.htm.ini
deleted file mode 100644
index 03dcdaed02f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-051.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-051.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-061.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-061.htm.ini
deleted file mode 100644
index 5bc74a51ae8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-061.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-061.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-062.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-062.htm.ini
deleted file mode 100644
index 0d05e2e2f0c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-062.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-062.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-072.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-072.htm.ini
deleted file mode 100644
index 997706f92a9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-072.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-072.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-073.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-073.htm.ini
deleted file mode 100644
index 9bf67cc6a62..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-073.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-073.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-094.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-094.htm.ini
deleted file mode 100644
index 559ed1d12c7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-094.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-094.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-095.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-095.htm.ini
deleted file mode 100644
index 4da21cb5996..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-095.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-095.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-replaced-height-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-replaced-height-005.htm.ini
index 5932e779dc7..29857655bb5 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-replaced-height-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-block-replaced-height-005.htm.ini
@@ -1,3 +1,3 @@
 [inline-block-replaced-height-005.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-width-002a.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-width-002a.htm.ini
deleted file mode 100644
index e072e541c97..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-width-002a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-width-002a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
deleted file mode 100644
index 550ad46772e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-zorder-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
index 8f3fd2946a6..dd7c76c5c27 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
@@ -1,3 +1,3 @@
 [inline-formatting-context-023.htm]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-height-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-height-005.htm.ini
deleted file mode 100644
index db842b634cc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-height-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-replaced-height-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-beginning-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-beginning-001.htm.ini
new file mode 100644
index 00000000000..ded52f14605
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-beginning-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-block-in-inlines-beginning-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-end-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-end-001.htm.ini
new file mode 100644
index 00000000000..e371772b9ad
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-end-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-block-in-inlines-end-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-middle-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-middle-001.htm.ini
new file mode 100644
index 00000000000..81429a13f08
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-block-in-inlines-middle-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-block-in-inlines-middle-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-beginning-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-beginning-001.htm.ini
new file mode 100644
index 00000000000..e47ab82f2b9
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-beginning-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-beginning-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-end-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-end-001.htm.ini
new file mode 100644
index 00000000000..f7f011cd3a2
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-end-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-end-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-001.htm.ini
new file mode 100644
index 00000000000..2594547c1c3
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-begin-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-002.htm.ini
new file mode 100644
index 00000000000..953f1f7da63
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-002.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-begin-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-003.htm.ini
new file mode 100644
index 00000000000..94c3a3dafb9
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-begin-003.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-begin-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-001.htm.ini
new file mode 100644
index 00000000000..acae67243f8
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-end-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-002.htm.ini
new file mode 100644
index 00000000000..14220cf72f7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-002.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-end-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-003.htm.ini
new file mode 100644
index 00000000000..1bf77ea60d1
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-end-003.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-end-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-001.htm.ini
new file mode 100644
index 00000000000..9e6405ea00c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-001.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-middle-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-002.htm.ini
new file mode 100644
index 00000000000..416025dc2a6
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-002.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-middle-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-003.htm.ini
new file mode 100644
index 00000000000..5210ddc3c38
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/insert-inline-in-blocks-n-inlines-middle-003.htm.ini
@@ -0,0 +1,3 @@
+[insert-inline-in-blocks-n-inlines-middle-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-005.htm.ini
deleted file mode 100644
index 00636a8af10..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-006.htm.ini
deleted file mode 100644
index 25bff25fd74..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-007.htm.ini
deleted file mode 100644
index 6717fc6ddd4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-013.htm.ini
index 6fccca4d39b..96712670c27 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-013.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-013.htm.ini
@@ -1,3 +1,3 @@
 [left-applies-to-013.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-014.htm.ini
index 0dbf9f776cf..a80449dca37 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-014.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-014.htm.ini
@@ -1,3 +1,3 @@
 [left-applies-to-014.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-015.htm.ini
deleted file mode 100644
index dd489fa888d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-offset-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-offset-001.htm.ini
deleted file mode 100644
index 049e8f48e0c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-offset-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-offset-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-offset-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-offset-002.htm.ini
deleted file mode 100644
index 9f7fad7f346..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-offset-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-offset-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-offset-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-offset-003.htm.ini
deleted file mode 100644
index 116c0c1d9bb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-offset-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-offset-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-offset-percentage-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-offset-percentage-001.htm.ini
deleted file mode 100644
index 4641267c48a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-offset-percentage-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-offset-percentage-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-006.htm.ini
deleted file mode 100644
index eb082657853..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-007.htm.ini
deleted file mode 100644
index 8ec919f9c68..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-017.htm.ini
deleted file mode 100644
index 08939ae00d2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-018.htm.ini
deleted file mode 100644
index 250ef5560fb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-018.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-018.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-028.htm.ini
deleted file mode 100644
index 32cc167f1c3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-028.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-028.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-029.htm.ini
deleted file mode 100644
index ddbbff2e8cc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-029.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-029.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-039.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-039.htm.ini
deleted file mode 100644
index 317c4a3a19e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-039.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-039.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-040.htm.ini
deleted file mode 100644
index 962dece323f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-040.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-040.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-050.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-050.htm.ini
deleted file mode 100644
index dc042b3b7ea..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-050.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-050.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-051.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-051.htm.ini
deleted file mode 100644
index 7c9611be7f1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-051.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-051.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-061.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-061.htm.ini
deleted file mode 100644
index f8567b47671..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-061.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-061.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-062.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-062.htm.ini
deleted file mode 100644
index 268d3982058..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-062.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-062.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-069.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-069.htm.ini
deleted file mode 100644
index 58df5b16c0c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-069.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-069.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-072.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-072.htm.ini
deleted file mode 100644
index d88e2bc770b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-072.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-072.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-073.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-073.htm.ini
deleted file mode 100644
index f2c60c7331f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-073.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-073.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-094.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-094.htm.ini
deleted file mode 100644
index 694e0adb2a4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-094.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-094.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-095.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-095.htm.ini
deleted file mode 100644
index 02460155592..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-095.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-095.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-102.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-102.htm.ini
deleted file mode 100644
index a2245a1834f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-102.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-102.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-105.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-105.htm.ini
deleted file mode 100644
index 04489426498..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-105.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-105.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-106.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-106.htm.ini
deleted file mode 100644
index dfbb3f9217c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-106.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-106.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-112.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-112.htm.ini
deleted file mode 100644
index e7777657bd7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-112.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-112.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-border-padding-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-border-padding-002.htm.ini
deleted file mode 100644
index f6742527251..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-border-padding-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-border-padding-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-root-102.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-004.htm.ini
similarity index 55%
rename from tests/wpt/metadata-css/css21_dev/html4/background-root-102.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/margin-collapse-004.htm.ini
index 1b873728b6e..3f42fbbb4e7 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-root-102.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-004.htm.ini
@@ -1,3 +1,3 @@
-[background-root-102.htm]
+[margin-collapse-004.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-008.htm.ini
deleted file mode 100644
index c47da3c5fa6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-014.htm.ini
deleted file mode 100644
index 80af7ba8bfc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-019.htm.ini
deleted file mode 100644
index a831eec56c4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-collapse-019.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-019.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-008.htm.ini
new file mode 100644
index 00000000000..a7af4bfeb13
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-008.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-008.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-019.htm.ini
new file mode 100644
index 00000000000..8ec7d0e198e
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-019.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-019.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-020.htm.ini
new file mode 100644
index 00000000000..abf76bf9dae
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-020.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-020.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-031.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-031.htm.ini
new file mode 100644
index 00000000000..adc8f34cb7a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-031.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-031.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-032.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-032.htm.ini
new file mode 100644
index 00000000000..4f015125b1b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-032.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-032.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-043.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-043.htm.ini
new file mode 100644
index 00000000000..75ce861dd28
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-043.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-043.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-044.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-044.htm.ini
new file mode 100644
index 00000000000..34bfdb7b66a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-044.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-044.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-055.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-055.htm.ini
new file mode 100644
index 00000000000..cac4ccc4760
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-055.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-055.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-056.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-056.htm.ini
new file mode 100644
index 00000000000..a7f8999e60b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-056.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-056.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-067.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-067.htm.ini
new file mode 100644
index 00000000000..0fe6c8f286a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-067.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-067.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-068.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-068.htm.ini
new file mode 100644
index 00000000000..b898faf11b0
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-068.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-068.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-079.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-079.htm.ini
new file mode 100644
index 00000000000..af1504ea257
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-079.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-079.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-080.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-080.htm.ini
new file mode 100644
index 00000000000..97841141839
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-080.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-080.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-103.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-103.htm.ini
new file mode 100644
index 00000000000..076e3b540e5
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-103.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-103.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-104.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-104.htm.ini
new file mode 100644
index 00000000000..6de8a0fb66c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-104.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-104.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-113.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-113.htm.ini
new file mode 100644
index 00000000000..0b2f3aa7559
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/margin-right-113.htm.ini
@@ -0,0 +1,3 @@
+[margin-right-113.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-right-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-right-applies-to-012.htm.ini
deleted file mode 100644
index 740bae46db8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-right-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-right-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-012.htm.ini
deleted file mode 100644
index 4af52cfe3a0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-top-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-006.htm.ini
deleted file mode 100644
index 2b809c7405a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-007.htm.ini
deleted file mode 100644
index 3592a3343f6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-017.htm.ini
deleted file mode 100644
index 506e8516e16..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-018.htm.ini
deleted file mode 100644
index d8915f08e7d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-018.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-018.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-028.htm.ini
deleted file mode 100644
index d676bd469a5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-028.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-028.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-029.htm.ini
deleted file mode 100644
index b813f8a5e0a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-029.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-029.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-039.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-039.htm.ini
deleted file mode 100644
index a6793e6f173..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-039.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-039.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-040.htm.ini
deleted file mode 100644
index e85d916610f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-040.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-040.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-050.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-050.htm.ini
deleted file mode 100644
index 507edeeeada..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-050.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-050.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-051.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-051.htm.ini
deleted file mode 100644
index d76925169d0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-051.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-051.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-061.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-061.htm.ini
deleted file mode 100644
index c7baba2e1aa..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-061.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-061.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-062.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-062.htm.ini
deleted file mode 100644
index 468fa7ef8b9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-062.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-062.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-072.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-072.htm.ini
deleted file mode 100644
index cc89568fd4b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-072.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-072.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-073.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-073.htm.ini
deleted file mode 100644
index 046f36faa5f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-073.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-073.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-094.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-094.htm.ini
deleted file mode 100644
index a561cb3cd98..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-094.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-094.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-095.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-095.htm.ini
deleted file mode 100644
index d25deacb669..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-095.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-095.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-107.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-107.htm.ini
deleted file mode 100644
index c9bfff0eacd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-107.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-107.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/max-height-110.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/max-height-110.htm.ini
deleted file mode 100644
index 21d4e382984..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/max-height-110.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-110.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-006.htm.ini
deleted file mode 100644
index dcd6643adec..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-007.htm.ini
deleted file mode 100644
index 7f9e185ff7a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-017.htm.ini
deleted file mode 100644
index 2cde6cb7e5e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-018.htm.ini
deleted file mode 100644
index 4d4737a83d7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-018.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-018.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-028.htm.ini
deleted file mode 100644
index ae702b62df0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-028.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-028.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-029.htm.ini
deleted file mode 100644
index 49e079defab..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-029.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-029.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-039.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-039.htm.ini
deleted file mode 100644
index 594b8a8c991..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-039.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-039.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-040.htm.ini
deleted file mode 100644
index f00ef500ec7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-040.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-040.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-050.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-050.htm.ini
deleted file mode 100644
index e6a7fef67c3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-050.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-050.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-051.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-051.htm.ini
deleted file mode 100644
index 3e1a83ed211..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-051.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-051.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-061.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-061.htm.ini
deleted file mode 100644
index 3ef76a6dec6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-061.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-061.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-062.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-062.htm.ini
deleted file mode 100644
index 1f7fdd69177..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-062.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-062.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-072.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-072.htm.ini
deleted file mode 100644
index 9af39d8d322..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-072.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-072.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-073.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-073.htm.ini
deleted file mode 100644
index b970fdfc440..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-073.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-073.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-094.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-094.htm.ini
deleted file mode 100644
index d34669cfdd1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-094.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-094.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-095.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-095.htm.ini
deleted file mode 100644
index 5dbad7e71b4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-095.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-095.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-104.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-104.htm.ini
deleted file mode 100644
index 1fec05c57f0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-104.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-104.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-105.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-105.htm.ini
deleted file mode 100644
index 165e8dea549..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-105.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-105.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-106.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-106.htm.ini
deleted file mode 100644
index 83bdbfdf497..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-height-106.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-106.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-005.htm.ini
deleted file mode 100644
index 40c1878ccab..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-006.htm.ini
deleted file mode 100644
index 3a172e017e8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-007.htm.ini
deleted file mode 100644
index 23a1e751887..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-008.htm.ini
deleted file mode 100644
index 2da991adec2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-012.htm.ini
deleted file mode 100644
index b92fdd9bdc5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini
new file mode 100644
index 00000000000..d0d392f62bb
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini
@@ -0,0 +1,3 @@
+[padding-right-applies-to-014.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-013.htm.ini
index d821296a441..dc83ac33fd7 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-013.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-013.htm.ini
@@ -1,3 +1,3 @@
 [position-applies-to-013.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-014.htm.ini
index e8dda6b57e1..936466d1a90 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-014.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-014.htm.ini
@@ -1,3 +1,3 @@
 [position-applies-to-014.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-fixed-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-fixed-001.htm.ini
deleted file mode 100644
index 5971aa42ceb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/position-fixed-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-fixed-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-relative-035.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-relative-035.htm.ini
deleted file mode 100644
index 9cb4b4c28f7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/position-relative-035.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-relative-035.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-001.htm.ini
deleted file mode 100644
index d89641a6e59..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[relpos-calcs-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-002.htm.ini
deleted file mode 100644
index 7c355d05eea..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[relpos-calcs-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-004.htm.ini
new file mode 100644
index 00000000000..d3c3fd079c4
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-004.htm.ini
@@ -0,0 +1,3 @@
+[relpos-calcs-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-005.htm.ini
new file mode 100644
index 00000000000..03661a477bc
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/relpos-calcs-005.htm.ini
@@ -0,0 +1,3 @@
+[relpos-calcs-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-139.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-007.htm.ini
similarity index 66%
rename from tests/wpt/metadata-css/css21_dev/html4/floats-139.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/right-007.htm.ini
index 4f47e84fdd9..6697f89a6e8 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-139.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-007.htm.ini
@@ -1,3 +1,3 @@
-[floats-139.htm]
+[right-007.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-008.htm.ini
new file mode 100644
index 00000000000..31cc869db84
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-008.htm.ini
@@ -0,0 +1,3 @@
+[right-008.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-031.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-031.htm.ini
new file mode 100644
index 00000000000..a2c47de1dd1
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-031.htm.ini
@@ -0,0 +1,3 @@
+[right-031.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-032.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-032.htm.ini
new file mode 100644
index 00000000000..714306c9a1e
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-032.htm.ini
@@ -0,0 +1,3 @@
+[right-032.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-079.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-079.htm.ini
new file mode 100644
index 00000000000..9ac5f5659f0
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-079.htm.ini
@@ -0,0 +1,3 @@
+[right-079.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-080.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-080.htm.ini
new file mode 100644
index 00000000000..171736f262c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-080.htm.ini
@@ -0,0 +1,3 @@
+[right-080.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-005.htm.ini
deleted file mode 100644
index d1bad4dcd85..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-006.htm.ini
deleted file mode 100644
index abaaa7abaed..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-007.htm.ini
deleted file mode 100644
index f442b953a91..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-013.htm.ini
index a19e60853d9..000506947de 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-013.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-013.htm.ini
@@ -1,3 +1,3 @@
 [right-applies-to-013.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-014.htm.ini
index 644cf6c84d6..e68401f1c10 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-014.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-014.htm.ini
@@ -1,3 +1,3 @@
 [right-applies-to-014.htm]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-015.htm.ini
deleted file mode 100644
index 5b7ece990a3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-offset-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-offset-001.htm.ini
deleted file mode 100644
index 7153fa214eb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-offset-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-offset-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-offset-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-offset-002.htm.ini
deleted file mode 100644
index 4354aad2b97..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-offset-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-offset-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-offset-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-offset-003.htm.ini
deleted file mode 100644
index 1a735700149..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-offset-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-offset-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-015.htm.ini
deleted file mode 100644
index 1b84620f211..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-basic-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
deleted file mode 100644
index 9e2f33bfcec..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-basic-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-block-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-block-between-002.htm.ini
deleted file mode 100644
index ddc36ea0401..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-block-between-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-block-between-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-display-none-between-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-display-none-between-003.htm.ini
new file mode 100644
index 00000000000..ec1d723ee59
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/run-in-display-none-between-003.htm.ini
@@ -0,0 +1,3 @@
+[run-in-display-none-between-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-block-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-block-between-002.htm.ini
deleted file mode 100644
index 672b284ca2b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-block-between-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-inline-block-between-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-table-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-table-between-002.htm.ini
deleted file mode 100644
index 82506ab3dfd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-inline-table-between-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-inline-table-between-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-restyle-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-restyle-002.htm.ini
deleted file mode 100644
index 2894216bff9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-restyle-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-restyle-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-run-in-between-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-run-in-between-008.htm.ini
deleted file mode 100644
index 830ab834504..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-run-in-between-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-run-in-between-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini
new file mode 100644
index 00000000000..95b1c045605
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini
@@ -0,0 +1,3 @@
+[run-in-table-cell-between-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini
new file mode 100644
index 00000000000..5ab8feb447e
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini
@@ -0,0 +1,3 @@
+[run-in-table-cell-between-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-bg-pos-204.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-text-between-003.htm.ini
similarity index 52%
rename from tests/wpt/metadata-css/css21_dev/html4/background-bg-pos-204.htm.ini
rename to tests/wpt/metadata-css/css21_dev/html4/run-in-text-between-003.htm.ini
index 7eb91fc1d34..a09ef7bedc0 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-bg-pos-204.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/run-in-text-between-003.htm.ini
@@ -1,3 +1,3 @@
-[background-bg-pos-204.htm]
+[run-in-text-between-003.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-cell-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-cell-001.htm.ini
index e2d3b53d223..eeb6505d10d 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-cell-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-cell-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-cell-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-colgroup-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-colgroup-001.htm.ini
index 8a7294bc385..d0050d37877 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-colgroup-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-colgroup-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-colgroup-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-column-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-column-001.htm.ini
index ce0aad5b983..cd40f4c6c0b 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-column-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-column-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-column-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-row-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-row-001.htm.ini
index f68fcd017b7..7cc8bc68c1c 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-row-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-row-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-row-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-rowgroup-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-rowgroup-001.htm.ini
index 1b9ad1f2990..8f87cfb404d 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-rowgroup-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-rowgroup-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-rowgroup-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-table-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-table-001.htm.ini
index 7f9914be705..2e8caccef2b 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-table-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-backgrounds-bc-table-001.htm.ini
@@ -1,3 +1,3 @@
 [table-backgrounds-bc-table-001.htm]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini
new file mode 100644
index 00000000000..3814d112c34
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini
@@ -0,0 +1,3 @@
+[top-applies-to-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini
new file mode 100644
index 00000000000..f791160c7d4
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini
@@ -0,0 +1,3 @@
+[top-applies-to-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini
new file mode 100644
index 00000000000..866983b0a4a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini
@@ -0,0 +1,3 @@
+[top-applies-to-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-005.htm.ini
deleted file mode 100644
index 177ae7907dc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-006.htm.ini
deleted file mode 100644
index 10a758f9906..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-007.htm.ini
deleted file mode 100644
index 27efd2a4909..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-013.htm.ini
deleted file mode 100644
index 4fe8c6c489f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-013.htm]
-  type: reftest
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-014.htm.ini
deleted file mode 100644
index 8795cc43ddc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-014.htm]
-  type: reftest
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-015.htm.ini
deleted file mode 100644
index 9f5e45d0b4f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-offset-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-offset-001.htm.ini
deleted file mode 100644
index 540c82eba1f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-offset-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-offset-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-offset-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-offset-002.htm.ini
deleted file mode 100644
index 355569401f1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-offset-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-offset-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-offset-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-offset-003.htm.ini
deleted file mode 100644
index 46faea10be4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-offset-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-offset-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/unicode-bidi-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/unicode-bidi-001.htm.ini
deleted file mode 100644
index 4515c0ec2f2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/unicode-bidi-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[unicode-bidi-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/vertical-align-sub-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/vertical-align-sub-001.htm.ini
deleted file mode 100644
index c2e59e13bc8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/vertical-align-sub-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[vertical-align-sub-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/vertical-align-super-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/vertical-align-super-001.htm.ini
deleted file mode 100644
index f839dc96763..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/vertical-align-super-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[vertical-align-super-001.htm]
-  type: reftest
-  expected: FAIL