From 0ad6e78b23089bb4a433b2d77a0bdcd67b040bb3 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Fri, 25 Sep 2015 11:45:40 +0200
Subject: [PATCH] Update CSS tests to revision
 939546644b4d333218fd9c2c0f68c60752ff1e95

---
 .../html4/background-repeat-round-002.htm     |   25 +
 .../html4/background-repeat-round.htm         |   52 +-
 .../html4/background-size-003.htm             |   32 +
 .../html4/border-image-slice-005.htm          |   24 +
 ...ice-004.htm => border-image-slice-007.htm} |    0
 .../html4/border-radius-shorthand-002.htm     |   37 +
 .../html4/box-shadow-001.htm                  |   66 +-
 .../html4/box-shadow-005.htm                  |   36 +
 .../css-backgrounds-3_dev/html4/chapter-3.htm |   34 +-
 .../css-backgrounds-3_dev/html4/chapter-5.htm |   15 +-
 .../css-backgrounds-3_dev/html4/chapter-6.htm |   19 +-
 .../css-backgrounds-3_dev/html4/chapter-7.htm |   23 +-
 .../border-radius-shorthand-002-ref.htm       |   31 +
 ...dow-001-ref.htm => box-shadow-005-ref.htm} |    0
 .../html4/reftest-toc.htm                     |   22 +-
 .../css-backgrounds-3_dev/html4/reftest.list  |    4 +-
 .../css-backgrounds-3_dev/html4/toc.htm       |    8 +-
 .../implementation-report-TEMPLATE.data       |   22 +-
 .../css-tests/css-backgrounds-3_dev/index.htm |    1 +
 .../css-tests/css-backgrounds-3_dev/index.xht |    1 +
 .../css-backgrounds-3_dev/testinfo.data       |   11 +-
 .../xhtml1/background-repeat-round-002.xht    |   25 +
 .../xhtml1/background-repeat-round.xht        |   50 +-
 .../xhtml1/background-size-003.xht            |   32 +
 .../xhtml1/border-image-slice-005.xht         |   24 +
 ...ice-004.xht => border-image-slice-007.xht} |    0
 .../xhtml1/border-radius-shorthand-002.xht    |   37 +
 .../xhtml1/box-shadow-001.xht                 |   62 +-
 .../xhtml1/box-shadow-005.xht                 |   36 +
 .../xhtml1/chapter-3.xht                      |   34 +-
 .../xhtml1/chapter-5.xht                      |   15 +-
 .../xhtml1/chapter-6.xht                      |   19 +-
 .../xhtml1/chapter-7.xht                      |   23 +-
 .../border-radius-shorthand-002-ref.xht       |   31 +
 ...dow-001-ref.xht => box-shadow-005-ref.xht} |    0
 .../xhtml1/reftest-toc.xht                    |   22 +-
 .../css-backgrounds-3_dev/xhtml1/reftest.list |    4 +-
 .../css-backgrounds-3_dev/xhtml1/toc.xht      |    8 +-
 .../background-repeat-round-002.xht           |   25 +
 .../xhtml1print/background-repeat-round.xht   |   57 +-
 .../xhtml1print/background-size-003.xht       |   32 +
 .../xhtml1print/border-image-slice-005.xht    |   24 +
 ...ice-004.xht => border-image-slice-007.xht} |    0
 .../border-radius-shorthand-002.xht           |   37 +
 .../xhtml1print/box-shadow-001.xht            |   62 +-
 .../xhtml1print/box-shadow-005.xht            |   36 +
 .../xhtml1print/chapter-3.xht                 |   34 +-
 .../xhtml1print/chapter-5.xht                 |   15 +-
 .../xhtml1print/chapter-6.xht                 |   19 +-
 .../xhtml1print/chapter-7.xht                 |   23 +-
 .../border-radius-shorthand-002-ref.xht       |   31 +
 ...dow-001-ref.xht => box-shadow-005-ref.xht} |    0
 .../xhtml1print/reftest-toc.xht               |   22 +-
 .../xhtml1print/reftest.list                  |    4 +-
 .../css-backgrounds-3_dev/xhtml1print/toc.xht |    8 +-
 .../css-fonts-3_dev/html/chapter-3.htm        |    2 +-
 .../html/font-size-adjust-005.htm             |    2 +-
 .../html/font-size-adjust-006.htm             |    2 +-
 .../html/font-size-adjust-007.htm             |    4 +-
 .../html/font-size-adjust-008.htm             |    2 +-
 .../ref-filled-green-100px-square.htm         |   28 +
 .../css-fonts-3_dev/html/reftest-toc.htm      |    2 +-
 .../css-fonts-3_dev/html/reftest.list         |    2 +-
 .../implementation-report-TEMPLATE.data       |   16 +-
 .../css-tests/css-fonts-3_dev/testinfo.data   |    8 +-
 .../css-fonts-3_dev/xhtml1/chapter-3.xht      |    2 +-
 .../xhtml1/font-size-adjust-005.xht           |    2 +-
 .../xhtml1/font-size-adjust-006.xht           |    2 +-
 .../xhtml1/font-size-adjust-007.xht           |    4 +-
 .../xhtml1/font-size-adjust-008.xht           |    2 +-
 .../ref-filled-green-100px-square.xht         |   28 +
 .../css-fonts-3_dev/xhtml1/reftest-toc.xht    |    2 +-
 .../css-fonts-3_dev/xhtml1/reftest.list       |    2 +-
 .../css-fonts-3_dev/xhtml1print/chapter-3.xht |    2 +-
 .../xhtml1print/font-size-adjust-005.xht      |    2 +-
 .../xhtml1print/font-size-adjust-006.xht      |    2 +-
 .../xhtml1print/font-size-adjust-007.xht      |    4 +-
 .../xhtml1print/font-size-adjust-008.xht      |    2 +-
 .../ref-filled-green-100px-square.xht         |   37 +
 .../xhtml1print/reftest-toc.xht               |    2 +-
 .../css-fonts-3_dev/xhtml1print/reftest.list  |    2 +-
 .../css-style-attr-1_dev/html4/chapter-4.htm  |    4 +-
 ....htm => ref-white-on-green-background.htm} |    0
 .../html4/reftest-toc.htm                     |    4 +-
 .../css-style-attr-1_dev/html4/reftest.list   |    4 +-
 .../html4/style-attr-cascade-004.htm          |    2 +-
 .../html4/style-attr-cascade-005.htm          |    2 +-
 .../implementation-report-TEMPLATE.data       |    8 +-
 .../css-style-attr-1_dev/testinfo.data        |    4 +-
 .../css-style-attr-1_dev/xhtml1/chapter-4.xht |    4 +-
 ....xht => ref-white-on-green-background.xht} |    0
 .../xhtml1/reftest-toc.xht                    |    4 +-
 .../css-style-attr-1_dev/xhtml1/reftest.list  |    4 +-
 .../xhtml1/style-attr-cascade-004.xht         |    2 +-
 .../xhtml1/style-attr-cascade-005.xht         |    2 +-
 .../xhtml1print/chapter-4.xht                 |    4 +-
 ....xht => ref-white-on-green-background.xht} |    0
 .../xhtml1print/reftest-toc.xht               |    4 +-
 .../xhtml1print/reftest.list                  |    4 +-
 .../xhtml1print/style-attr-cascade-004.xht    |    2 +-
 .../xhtml1print/style-attr-cascade-005.xht    |    2 +-
 .../css-text-decor-3_dev/html/chapter-3.htm   |   15 +-
 .../reference/text-emphasis-style-001-ref.htm |   12 +
 .../css-text-decor-3_dev/html/reftest-toc.htm |    8 +
 .../css-text-decor-3_dev/html/reftest.list    |    1 +
 .../html/text-emphasis-style-001.htm          |   29 +
 .../css-text-decor-3_dev/html/toc.htm         |    2 +-
 .../implementation-report-TEMPLATE.data       |    2 +
 .../css-tests/css-text-decor-3_dev/index.htm  |    1 +
 .../css-tests/css-text-decor-3_dev/index.xht  |    1 +
 .../css-text-decor-3_dev/testinfo.data        |    1 +
 .../css-text-decor-3_dev/xhtml1/chapter-3.xht |   15 +-
 .../reference/text-emphasis-style-001-ref.xht |   12 +
 .../xhtml1/reftest-toc.xht                    |    8 +
 .../css-text-decor-3_dev/xhtml1/reftest.list  |    1 +
 .../xhtml1/text-emphasis-style-001.xht        |   29 +
 .../css-text-decor-3_dev/xhtml1/toc.xht       |    2 +-
 .../xhtml1print/chapter-3.xht                 |   15 +-
 .../reference/text-emphasis-style-001-ref.xht |   12 +
 .../xhtml1print/reftest-toc.xht               |    8 +
 .../xhtml1print/reftest.list                  |    1 +
 .../xhtml1print/text-emphasis-style-001.xht   |   29 +
 .../css-text-decor-3_dev/xhtml1print/toc.xht  |    2 +-
 .../html/chapter-2.htm                        |   96 +-
 .../html/chapter-3.htm                        |   78 +-
 .../html/chapter-4.htm                        |   43 +-
 .../html/chapter-5.htm                        |   48 +-
 .../html/inline-block-alignment-007.htm       |    7 +-
 .../html/inline-block-alignment-009.htm       |   61 -
 ...ine-block-alignment-orthogonal-vlr-003.htm |    2 +-
 ...ine-block-alignment-orthogonal-vlr-005.htm |    2 +-
 ...ine-block-alignment-orthogonal-vrl-002.htm |    2 +-
 ...ine-block-alignment-orthogonal-vrl-004.htm |    2 +-
 .../html/margin-vlr-003.htm                   |    2 +-
 .../html/margin-vrl-002.htm                   |    2 +-
 .../inline-block-alignment-007-ref.htm        |   42 -
 .../inline-block-alignment-009-ref.htm        |   42 -
 .../reference/table-progression-001-ref.htm   |   93 -
 .../html/reference/text-baseline-007-ref.htm  |   36 -
 .../reference/text-indent-vlr-011-ref.htm     |    2 +-
 .../reference/text-indent-vlr-013-ref.htm     |    2 +-
 .../reference/text-indent-vrl-010-ref.htm     |    2 +-
 .../reference/text-indent-vrl-012-ref.htm     |    2 +-
 .../html/reftest-toc.htm                      |   78 +-
 .../css-writing-modes-3_dev/html/reftest.list |   17 +-
 .../html/table-progression-001-vlr.htm        |   95 +-
 .../html/table-progression-001-vrl.htm        |   99 +-
 .../html/table-progression-002-vlr.htm        |   88 +
 .../html/table-progression-002-vrl.htm        |   87 +
 .../html/table-progression-003-vlr.htm        |  116 +
 .../html/table-progression-003-vrl.htm        |  116 +
 .../html/table-progression-004-vlr.htm        |   77 +
 .../html/table-progression-004-vrl.htm        |   76 +
 .../html/text-baseline-007.htm                |    5 +-
 .../html/text-baseline-008.htm                |   41 -
 .../html/text-baseline-009.htm                |   41 -
 .../html/text-indent-vlr-003.htm              |    2 +-
 .../html/text-indent-vlr-005.htm              |    2 +-
 .../html/text-indent-vlr-007.htm              |    2 +-
 .../html/text-indent-vlr-009.htm              |    2 +-
 .../html/text-indent-vlr-011.htm              |    2 +-
 .../html/text-indent-vlr-013.htm              |    2 +-
 .../html/text-indent-vlr-015.htm              |    2 +-
 .../html/text-indent-vlr-017.htm              |    2 +-
 .../html/text-indent-vrl-002.htm              |    2 +-
 .../html/text-indent-vrl-004.htm              |    2 +-
 .../html/text-indent-vrl-006.htm              |    2 +-
 .../html/text-indent-vrl-008.htm              |    2 +-
 .../html/text-indent-vrl-010.htm              |    2 +-
 .../html/text-indent-vrl-012.htm              |    2 +-
 .../html/text-indent-vrl-014.htm              |    2 +-
 .../html/text-indent-vrl-016.htm              |    2 +-
 .../html/text-orientation-sideways-001.htm    |    6 +-
 .../text-orientation-sideways-right-001.htm   |    6 +-
 .../html/text-orientation-upright-001.htm     |    6 +-
 .../css-writing-modes-3_dev/html/toc.htm      |    8 +-
 .../implementation-report-TEMPLATE.data       |  134 +-
 .../css-writing-modes-3_dev/testinfo.data     |   67 +-
 .../xhtml1/chapter-2.xht                      |   96 +-
 .../xhtml1/chapter-3.xht                      |   78 +-
 .../xhtml1/chapter-4.xht                      |   43 +-
 .../xhtml1/chapter-5.xht                      |   48 +-
 .../xhtml1/inline-block-alignment-007.xht     |    7 +-
 .../xhtml1/inline-block-alignment-009.xht     |   61 -
 ...ine-block-alignment-orthogonal-vlr-003.xht |    2 +-
 ...ine-block-alignment-orthogonal-vlr-005.xht |    2 +-
 ...ine-block-alignment-orthogonal-vrl-002.xht |    2 +-
 ...ine-block-alignment-orthogonal-vrl-004.xht |    2 +-
 .../xhtml1/margin-vlr-003.xht                 |    2 +-
 .../xhtml1/margin-vrl-002.xht                 |    2 +-
 .../inline-block-alignment-007-ref.xht        |   42 -
 .../inline-block-alignment-009-ref.xht        |   42 -
 .../reference/table-progression-001-ref.xht   |   93 -
 .../reference/text-baseline-007-ref.xht       |   36 -
 .../reference/text-indent-vlr-011-ref.xht     |    2 +-
 .../reference/text-indent-vlr-013-ref.xht     |    2 +-
 .../reference/text-indent-vrl-010-ref.xht     |    2 +-
 .../reference/text-indent-vrl-012-ref.xht     |    2 +-
 .../xhtml1/reftest-toc.xht                    |   78 +-
 .../xhtml1/reftest.list                       |   17 +-
 .../xhtml1/table-progression-001-vlr.xht      |   95 +-
 .../xhtml1/table-progression-001-vrl.xht      |   99 +-
 .../xhtml1/table-progression-002-vlr.xht      |   88 +
 .../xhtml1/table-progression-002-vrl.xht      |   87 +
 .../xhtml1/table-progression-003-vlr.xht      |  116 +
 .../xhtml1/table-progression-003-vrl.xht      |  116 +
 .../xhtml1/table-progression-004-vlr.xht      |   77 +
 .../xhtml1/table-progression-004-vrl.xht      |   76 +
 .../xhtml1/text-baseline-007.xht              |    5 +-
 .../xhtml1/text-baseline-008.xht              |   41 -
 .../xhtml1/text-baseline-009.xht              |   41 -
 .../xhtml1/text-indent-vlr-003.xht            |    2 +-
 .../xhtml1/text-indent-vlr-005.xht            |    2 +-
 .../xhtml1/text-indent-vlr-007.xht            |    2 +-
 .../xhtml1/text-indent-vlr-009.xht            |    2 +-
 .../xhtml1/text-indent-vlr-011.xht            |    2 +-
 .../xhtml1/text-indent-vlr-013.xht            |    2 +-
 .../xhtml1/text-indent-vlr-015.xht            |    2 +-
 .../xhtml1/text-indent-vlr-017.xht            |    2 +-
 .../xhtml1/text-indent-vrl-002.xht            |    2 +-
 .../xhtml1/text-indent-vrl-004.xht            |    2 +-
 .../xhtml1/text-indent-vrl-006.xht            |    2 +-
 .../xhtml1/text-indent-vrl-008.xht            |    2 +-
 .../xhtml1/text-indent-vrl-010.xht            |    2 +-
 .../xhtml1/text-indent-vrl-012.xht            |    2 +-
 .../xhtml1/text-indent-vrl-014.xht            |    2 +-
 .../xhtml1/text-indent-vrl-016.xht            |    2 +-
 .../xhtml1/text-orientation-sideways-001.xht  |    6 +-
 .../text-orientation-sideways-right-001.xht   |    6 +-
 .../xhtml1/text-orientation-upright-001.xht   |    6 +-
 .../css-writing-modes-3_dev/xhtml1/toc.xht    |    8 +-
 .../xhtml1print/chapter-2.xht                 |   96 +-
 .../xhtml1print/chapter-3.xht                 |   78 +-
 .../xhtml1print/chapter-4.xht                 |   43 +-
 .../xhtml1print/chapter-5.xht                 |   48 +-
 .../inline-block-alignment-007.xht            |    7 +-
 .../inline-block-alignment-009.xht            |   70 -
 ...ine-block-alignment-orthogonal-vlr-003.xht |    2 +-
 ...ine-block-alignment-orthogonal-vlr-005.xht |    2 +-
 ...ine-block-alignment-orthogonal-vrl-002.xht |    2 +-
 ...ine-block-alignment-orthogonal-vrl-004.xht |    2 +-
 .../xhtml1print/margin-vlr-003.xht            |    2 +-
 .../xhtml1print/margin-vrl-002.xht            |    2 +-
 .../inline-block-alignment-007-ref.xht        |   51 -
 .../inline-block-alignment-009-ref.xht        |   51 -
 .../reference/table-progression-001-ref.xht   |   93 -
 .../reference/text-baseline-007-ref.xht       |   45 -
 .../reference/text-indent-vlr-011-ref.xht     |    2 +-
 .../reference/text-indent-vlr-013-ref.xht     |    2 +-
 .../reference/text-indent-vrl-010-ref.xht     |    2 +-
 .../reference/text-indent-vrl-012-ref.xht     |    2 +-
 .../xhtml1print/reftest-toc.xht               |   78 +-
 .../xhtml1print/reftest.list                  |   17 +-
 .../xhtml1print/table-progression-001-vlr.xht |   95 +-
 .../xhtml1print/table-progression-001-vrl.xht |   99 +-
 .../xhtml1print/table-progression-002-vlr.xht |   88 +
 .../xhtml1print/table-progression-002-vrl.xht |   87 +
 .../xhtml1print/table-progression-003-vlr.xht |  116 +
 .../xhtml1print/table-progression-003-vrl.xht |  116 +
 .../xhtml1print/table-progression-004-vlr.xht |   77 +
 .../xhtml1print/table-progression-004-vrl.xht |   76 +
 .../xhtml1print/text-baseline-007.xht         |    5 +-
 .../xhtml1print/text-baseline-008.xht         |   50 -
 .../xhtml1print/text-baseline-009.xht         |   50 -
 .../xhtml1print/text-indent-vlr-003.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-005.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-007.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-009.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-011.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-013.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-015.xht       |    2 +-
 .../xhtml1print/text-indent-vlr-017.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-002.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-004.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-006.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-008.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-010.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-012.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-014.xht       |    2 +-
 .../xhtml1print/text-indent-vrl-016.xht       |    2 +-
 .../text-orientation-sideways-001.xht         |    6 +-
 .../text-orientation-sideways-right-001.xht   |    6 +-
 .../text-orientation-upright-001.xht          |    6 +-
 .../xhtml1print/toc.xht                       |    8 +-
 .../css-tests/css21_dev/html4/chapter-12.htm  |    2 +-
 .../css-tests/css21_dev/html4/chapter-5.htm   |   26 +-
 .../css-tests/css21_dev/html4/chapter-6.htm   |    8 +-
 .../css-tests/css21_dev/html4/chapter-9.htm   |   17 +-
 .../html4/descendant-selector-000.htm         |    1 +
 .../html4/descendant-selector-001.htm         |    1 +
 .../html4/descendent-selector-002.htm         |    1 +
 .../html4/descendent-selector-003.htm         |    1 +
 .../html4/descendent-selector-004.htm         |    1 +
 .../html4/descendent-selector-006.htm         |    1 +
 .../css21_dev/html4/grouping-000.htm          |    2 +
 .../css21_dev/html4/grouping-001.htm          |    2 +
 .../css21_dev/html4/grouping-002.htm          |    2 +
 .../html4/inline-block-alignment-007.htm      |    7 +-
 .../html4/inline-block-alignment-009.htm      |   61 -
 .../html4/left-offset-position-fixed-001.htm  |    2 +-
 .../reference/descendant-selector-000-ref.htm |   23 +
 .../reference/descendent-selector-002-ref.htm |   16 +
 .../reference/descendent-selector-004-ref.htm |   11 +
 .../html4/reference/grouping-000-notref.htm   |   12 +
 .../html4/reference/grouping-000-ref.htm      |   18 +
 .../html4/reference/grouping-002-notref.htm   |   12 +
 .../html4/reference/grouping-002-ref.htm      |   20 +
 .../inline-block-alignment-007-ref.htm        |   42 -
 .../inline-block-alignment-009-ref.htm        |   42 -
 .../html4/reference/ref-green-background.htm  |   25 +-
 .../ref-white-on-green-background.htm         |   11 +
 .../html4/reference/type-selector-001-ref.htm |   17 +
 .../universal-selector-001-notref.htm         |   11 +
 .../reference/universal-selector-001-ref.htm  |   16 +
 .../universal-selector-002-notref.htm         |   11 +
 .../reference/universal-selector-002-ref.htm  |   16 +
 .../reference/universal-selector-005-ref.htm  |   21 +
 .../css-tests/css21_dev/html4/reftest-toc.htm |  118 +-
 .../css-tests/css21_dev/html4/reftest.list    |   20 +-
 .../html4/style-attr-cascade-004.htm          |    2 +-
 .../html4/style-attr-cascade-005.htm          |    2 +-
 tests/wpt/css-tests/css21_dev/html4/toc.htm   |    2 +-
 .../css21_dev/html4/type-selector-001.htm     |    1 +
 .../html4/universal-selector-001.htm          |    2 +
 .../html4/universal-selector-002.htm          |    2 +
 .../html4/universal-selector-005.htm          |    1 +
 .../implementation-report-TEMPLATE.data       |   98 +-
 tests/wpt/css-tests/css21_dev/testinfo.data   |   49 +-
 .../css-tests/css21_dev/xhtml1/chapter-12.xht |    2 +-
 .../css-tests/css21_dev/xhtml1/chapter-5.xht  |   26 +-
 .../css-tests/css21_dev/xhtml1/chapter-6.xht  |    8 +-
 .../css-tests/css21_dev/xhtml1/chapter-9.xht  |   17 +-
 .../xhtml1/descendant-selector-000.xht        |    1 +
 .../xhtml1/descendant-selector-001.xht        |    1 +
 .../xhtml1/descendent-selector-002.xht        |    1 +
 .../xhtml1/descendent-selector-003.xht        |    1 +
 .../xhtml1/descendent-selector-004.xht        |    1 +
 .../xhtml1/descendent-selector-006.xht        |    1 +
 .../css21_dev/xhtml1/grouping-000.xht         |    2 +
 .../css21_dev/xhtml1/grouping-001.xht         |    2 +
 .../css21_dev/xhtml1/grouping-002.xht         |    2 +
 .../xhtml1/inline-block-alignment-007.xht     |    7 +-
 .../xhtml1/inline-block-alignment-009.xht     |   61 -
 .../xhtml1/left-offset-position-fixed-001.xht |    2 +-
 .../reference/descendant-selector-000-ref.xht |   23 +
 .../reference/descendent-selector-002-ref.xht |   16 +
 .../reference/descendent-selector-004-ref.xht |   11 +
 .../xhtml1/reference/grouping-000-notref.xht  |   12 +
 .../xhtml1/reference/grouping-000-ref.xht     |   18 +
 .../xhtml1/reference/grouping-002-notref.xht  |   12 +
 .../xhtml1/reference/grouping-002-ref.xht     |   20 +
 .../inline-block-alignment-007-ref.xht        |   42 -
 .../inline-block-alignment-009-ref.xht        |   42 -
 .../xhtml1/reference/ref-green-background.xht |   23 +-
 .../ref-white-on-green-background.xht         |   11 +
 .../reference/type-selector-001-ref.xht       |   17 +
 .../universal-selector-001-notref.xht         |   11 +
 .../reference/universal-selector-001-ref.xht  |   16 +
 .../universal-selector-002-notref.xht         |   11 +
 .../reference/universal-selector-002-ref.xht  |   16 +
 .../reference/universal-selector-005-ref.xht  |   21 +
 .../css21_dev/xhtml1/reftest-toc.xht          |  118 +-
 .../css-tests/css21_dev/xhtml1/reftest.list   |   20 +-
 .../xhtml1/style-attr-cascade-004.xht         |    2 +-
 .../xhtml1/style-attr-cascade-005.xht         |    2 +-
 tests/wpt/css-tests/css21_dev/xhtml1/toc.xht  |    2 +-
 .../css21_dev/xhtml1/type-selector-001.xht    |    1 +
 .../xhtml1/universal-selector-001.xht         |    2 +
 .../xhtml1/universal-selector-002.xht         |    2 +
 .../xhtml1/universal-selector-005.xht         |    1 +
 .../css21_dev/xhtml1print/chapter-12.xht      |    2 +-
 .../css21_dev/xhtml1print/chapter-5.xht       |   26 +-
 .../css21_dev/xhtml1print/chapter-6.xht       |    8 +-
 .../css21_dev/xhtml1print/chapter-9.xht       |   17 +-
 .../xhtml1print/descendant-selector-000.xht   |    1 +
 .../xhtml1print/descendant-selector-001.xht   |    1 +
 .../xhtml1print/descendent-selector-002.xht   |    1 +
 .../xhtml1print/descendent-selector-003.xht   |    1 +
 .../xhtml1print/descendent-selector-004.xht   |    1 +
 .../xhtml1print/descendent-selector-006.xht   |    1 +
 .../css21_dev/xhtml1print/grouping-000.xht    |    2 +
 .../css21_dev/xhtml1print/grouping-001.xht    |    2 +
 .../css21_dev/xhtml1print/grouping-002.xht    |    2 +
 .../inline-block-alignment-007.xht            |    7 +-
 .../inline-block-alignment-009.xht            |   70 -
 .../left-offset-position-fixed-001.xht        |    2 +-
 .../reference/descendant-selector-000-ref.xht |   32 +
 .../reference/descendent-selector-002-ref.xht |   25 +
 .../reference/descendent-selector-004-ref.xht |   20 +
 .../reference/grouping-000-notref.xht         |   21 +
 .../reference/grouping-000-ref.xht            |   27 +
 .../reference/grouping-002-notref.xht         |   21 +
 .../reference/grouping-002-ref.xht            |   29 +
 .../inline-block-alignment-007-ref.xht        |   51 -
 .../inline-block-alignment-009-ref.xht        |   51 -
 .../reference/ref-green-background.xht        |   32 +-
 .../ref-white-on-green-background.xht         |   11 +
 .../reference/type-selector-001-ref.xht       |   26 +
 .../universal-selector-001-notref.xht         |   20 +
 .../reference/universal-selector-001-ref.xht  |   25 +
 .../universal-selector-002-notref.xht         |   20 +
 .../reference/universal-selector-002-ref.xht  |   25 +
 .../reference/universal-selector-005-ref.xht  |   30 +
 .../css21_dev/xhtml1print/reftest-toc.xht     |  118 +-
 .../css21_dev/xhtml1print/reftest.list        |   20 +-
 .../xhtml1print/style-attr-cascade-004.xht    |    2 +-
 .../xhtml1print/style-attr-cascade-005.xht    |    2 +-
 .../css-tests/css21_dev/xhtml1print/toc.xht   |    2 +-
 .../xhtml1print/type-selector-001.xht         |    1 +
 .../xhtml1print/universal-selector-001.xht    |    2 +
 .../xhtml1print/universal-selector-002.xht    |    2 +
 .../xhtml1print/universal-selector-005.xht    |    1 +
 tests/wpt/css-tests/source_rev                |    2 +-
 tests/wpt/metadata-css/MANIFEST.json          | 1956 ++++++++++++++---
 .../css21_dev/html4/at-charset-071.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-072.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-073.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-074.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-075.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-076.htm.ini    |    3 -
 .../css21_dev/html4/at-charset-077.htm.ini    |    3 -
 .../html4/case-sensitive-000.htm.ini          |    3 -
 .../html4/case-sensitive-001.htm.ini          |    3 -
 .../css21_dev/html4/escapes-001.htm.ini       |    3 -
 .../css21_dev/html4/escapes-002.htm.ini       |    3 -
 .../css21_dev/html4/escapes-003.htm.ini       |    3 -
 .../css21_dev/html4/escapes-004.htm.ini       |    3 -
 .../css21_dev/html4/escapes-005.htm.ini       |    3 -
 .../css21_dev/html4/escapes-006.htm.ini       |    3 -
 .../css21_dev/html4/escapes-007.htm.ini       |    3 -
 .../css21_dev/html4/escapes-008.htm.ini       |    3 -
 .../css21_dev/html4/escapes-014.htm.ini       |    3 -
 .../html4/inline-block-alignment-009.htm.ini  |    3 -
 .../css21_dev/html4/keywords-000.htm.ini      |    3 -
 .../css21_dev/html4/uri-015.htm.ini           |    3 -
 435 files changed, 7534 insertions(+), 3290 deletions(-)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round-002.htm
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-size-003.htm
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-005.htm
 rename tests/wpt/css-tests/css-backgrounds-3_dev/html4/{border-image-slice-004.htm => border-image-slice-007.htm} (100%)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-005.htm
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm
 rename tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/{box-shadow-001-ref.htm => box-shadow-005-ref.htm} (100%)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round-002.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-size-003.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-005.xht
 rename tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/{border-image-slice-004.xht => border-image-slice-007.xht} (100%)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht
 rename tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/{box-shadow-001-ref.xht => box-shadow-005-ref.xht} (100%)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round-002.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-size-003.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-005.xht
 rename tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/{border-image-slice-004.xht => border-image-slice-007.xht} (100%)
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht
 create mode 100644 tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht
 rename tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/{box-shadow-001-ref.xht => box-shadow-005-ref.xht} (100%)
 create mode 100644 tests/wpt/css-tests/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm
 create mode 100644 tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht
 create mode 100644 tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht
 rename tests/wpt/css-tests/css-style-attr-1_dev/html4/reference/{ref-green-background.htm => ref-white-on-green-background.htm} (100%)
 rename tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reference/{ref-green-background.xht => ref-white-on-green-background.xht} (100%)
 rename tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reference/{ref-green-background.xht => ref-white-on-green-background.xht} (100%)
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/html/text-emphasis-style-001.htm
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht
 create mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht
 delete mode 100644 tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-009.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/descendant-selector-000-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-002-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-004-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-notref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-notref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-ref.htm
 delete mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-007-ref.htm
 delete mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-009-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/ref-white-on-green-background.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/type-selector-001-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-notref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-notref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-ref.htm
 create mode 100644 tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-005-ref.htm
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-009.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-ref.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-white-on-green-background.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/type-selector-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-005-ref.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-009.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-ref.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
 delete mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/type-selector-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht
 create mode 100644 tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-005-ref.xht
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-071.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-072.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-073.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-074.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-075.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-076.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/at-charset-077.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/case-sensitive-000.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/case-sensitive-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-001.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-003.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-004.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-005.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-006.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-008.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/escapes-014.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/inline-block-alignment-009.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/keywords-000.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css21_dev/html4/uri-015.htm.ini

diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round-002.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round-002.htm
new file mode 100644
index 00000000000..4efc1fa2c55
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round-002.htm
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html><!-- Submitted from TestTWF Paris --><head>
+
+<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
+<link href="http://lea.verou.me" rel="author" title="Lea Verou">
+<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help">
+<meta content="image" name="flags">
+<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert">
+<style>
+
+html {
+	background: red url('support/swatch-green.png') no-repeat;
+	background-repeat: round;
+}
+
+</style>
+
+</head>
+<body>
+
+<p>Test passes if there is green and <strong>no red</strong>.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round.htm
index 4efc1fa2c55..20777df4468 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-repeat-round.htm
@@ -1,25 +1,27 @@
-<!DOCTYPE html>
-<html><!-- Submitted from TestTWF Paris --><head>
-
-<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
-<link href="http://lea.verou.me" rel="author" title="Lea Verou">
-<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help">
-<meta content="image" name="flags">
-<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert">
-<style>
-
-html {
-	background: red url('support/swatch-green.png') no-repeat;
-	background-repeat: round;
-}
-
-</style>
-
-</head>
-<body>
-
-<p>Test passes if there is green and <strong>no red</strong>.</p>
-
-
-
-</body></html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <title>CSS Test: background-repeat:round</title>
+    <link rel="author" title="Jeffrey Carl Faden" href="http://www.jeffreyatw.com/">
+    <link rel="match" href="reference/background-repeat-round.htm">
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-repeat">
+    <meta name="flags" content="image">
+    <meta name="assert" content="The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.">
+    <style type="text/css">
+      
+      div {
+        background-image: url("support/rectangle-96x60.png");
+        background-repeat: round;
+        height: 204px;
+        width: 236px;
+      }
+      
+    </style>
+  </head>
+  <body>
+    <p><img src="support/rectangle-96x60.png" alt="Image download support must be enabled"></p>
+    <p>Test passes if the above image repeats in the below rectangle 6 times exactly: 2 columns, 3 rows. The top border of the containing rectangle should be orange, the right border yellow, the bottom border green, and the left border blue.</p>
+    <p>Test fails if the above image repeats in below rectangle more than 6 times, with partial images lining the right and the bottom.</p>
+    <div></div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-size-003.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-size-003.htm
new file mode 100644
index 00000000000..539913f5422
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/background-size-003.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Value of 'auto' is used for y dimension in 'background-size'</title> 
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft">
+        <link href="http://www.w3.org/TR/css3-background/#the-background-size" rel="help">
+        <meta content="" name="flags">
+        <meta content="An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension." name="assert">
+        <style type="text/css">
+            .test
+            {
+                width: 100px;
+                height: 100px;
+                background-repeat: no-repeat;
+                background-image: url("support/red_color.png");
+                background-size: 50px auto;
+            }
+            .reference
+            {
+                margin-top: -100px;
+                background: black;
+                width: 50px;
+                height: 50px;
+            }
+        </style>
+        </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p> 
+        <div class="test"></div>
+        <div class="reference"></div>
+    
+ 
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-005.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-005.htm
new file mode 100644
index 00000000000..4196d209e2e
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-005.htm
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: The 'border-image-slice' property with four percentage values</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft">
+        <link href="http://www.w3.org/TR/css3-background/#the-border-image-slice" rel="help">
+        <meta content="image" name="flags">
+        <meta content="This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets." name="assert">
+        <style type="text/css">
+            div
+            {
+                border: 40px double red;
+                border-image-slice: 40% 15% 20% 5%;
+                border-image-source: url("../support/9grid40-30-20-10-red.png");
+                height: 100px;
+                margin: 50px;
+                width: 200px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-004.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-007.htm
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-004.htm
rename to tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-image-slice-007.htm
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm
new file mode 100644
index 00000000000..c7f22d04f74
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html><head>
+        <title>CSS Test: Borders Radius Shorthand. </title>
+        <link href="mailto:arno@arno.org" rel="author" title="Arno">
+        <link href="http://www.w3.org/TR/css3-background/#the-border-radius" rel="help">
+        <link href="reference/border-radius-shorthand-002-ref.htm" rel="match">
+        <meta content="" name="flags">
+        <meta content="The shorthand border radius property can be used to specify all four eliptical corners of a box." name="assert">
+        <style type="text/css"> 
+        /* <![CDATA[ */
+        	div 
+            {
+				border-radius: 29px  43px 19px 13px / 5px 11px 23px 17px;
+
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+        	}
+        /* ]]> */ 
+        </style>
+
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+
+    
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-001.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-001.htm
index 3ca43ffe7d5..7b373610de9 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-001.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-001.htm
@@ -1,36 +1,32 @@
-<!DOCTYPE html>
-<html><head>
-    <title>CSS Test Background: Box-Shadow property</title>
-    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman">
-    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help">
-    <link href="reference/box-shadow-001-ref.htm" rel="match">
-    <meta content="Testing simple drop shadow with the box-shadow property" name="assert">
-    <style type="text/css">
-      #shadow-div {
-	 position: absolute;
-	 top: 50px;
-	 left: 5px;
-	 box-shadow: rgba(0,255,0,1) 10px 10px;
-	 background-color: #000;
-	 width: 144px;
-	 height: 144px;
-	 }
-	 #error {
-	 position: absolute;
-	 top: 60px;
-	 left: 15px;
-	 background-color: red;
-	 width: 144px;
-	 height: 144px;
-	 }
-    </style>
-</head>
-<body>
-    <p>The test passes if there is a green drop shadow and no red.</p>
-    <div id="error">
-    </div>
-    <div id="shadow-div">
-    </div>
-
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Positive value of horizontal offset</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft">
+        <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help">
+        <meta content="internal" name="flags">
+        <meta content="A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box." name="assert">
+        <style type="text/css">
+            #reference
+            {
+                width: 2in;
+                height: 1in;
+                background: red;
+                border: thin solid black;
+            }
+            div div
+            {
+                width: 1in;
+                height: 1in;
+                border: thin solid black;
+                background: white;
+                box-shadow: black 96px 0px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div id="reference">
+            <div></div>
+        </div>
+    
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-005.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-005.htm
new file mode 100644
index 00000000000..98eebd02f8f
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/box-shadow-005.htm
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html><head>
+    <title>CSS Test Background: Box-Shadow property</title>
+    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman">
+    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help">
+    <link href="reference/box-shadow-005-ref.htm" rel="match">
+    <meta content="Testing simple drop shadow with the box-shadow property" name="assert">
+    <style type="text/css">
+      #shadow-div {
+	 position: absolute;
+	 top: 50px;
+	 left: 5px;
+	 box-shadow: rgba(0,255,0,1) 10px 10px;
+	 background-color: #000;
+	 width: 144px;
+	 height: 144px;
+	 }
+	 #error {
+	 position: absolute;
+	 top: 60px;
+	 left: 15px;
+	 background-color: red;
+	 width: 144px;
+	 height: 144px;
+	 }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green drop shadow and no red.</p>
+    <div id="error">
+    </div>
+    <div id="shadow-div">
+    </div>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-3.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-3.htm
index e0928a58619..cd0d368eea8 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-3.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-3.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Backgrounds (383 tests)</h2>
+  <h2>Backgrounds (385 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -271,7 +271,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.4">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-repeat">3.4 Tiling Images: the &#8216;background-repeat&#8217; property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 23 tests -->
       <tr id="background-003-3.4" class="image">
         <td>
             <a href="background-003.htm">background-003</a></td>
@@ -385,11 +385,11 @@
       <tr id="background-repeat-round-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round.htm">background-repeat-round</a></strong></td>
-        <td></td>
+        <td><a href="reference/background-repeat-round.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>background-repeat: round basic support
+        <td>background-repeat:round
           <ul class="assert">
-            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+            <li>The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.</li>
           </ul>
         </td>
       </tr>
@@ -404,6 +404,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-repeat-round-002-3.4" class="primary image">
+        <td><strong>
+            <a href="background-repeat-round-002.htm">background-repeat-round-002</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>background-repeat: round basic support
+          <ul class="assert">
+            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-repeat-round-roundup-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round-roundup.htm">background-repeat-round-roundup</a></strong></td>
@@ -1502,7 +1513,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.9">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-size">3.9 Sizing Images: the &#8216;background-size&#8217; property</a></th></tr>
-      <!-- 262 tests -->
+      <!-- 263 tests -->
       <tr id="background-intrinsic-001-3.9" class="svg">
         <td>
             <a href="background-intrinsic-001.htm">background-intrinsic-001</a></td>
@@ -1635,6 +1646,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-size-003-3.9" class="primary">
+        <td><strong>
+            <a href="background-size-003.htm">background-size-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Value of 'auto' is used for y dimension in 'background-size'
+          <ul class="assert">
+            <li>An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-size-005-3.9" class="primary image">
         <td><strong>
             <a href="background-size-005.htm">background-size-005</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-5.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-5.htm
index 279e58d8a17..290668ac5fd 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-5.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-5.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Rounded Corners (108 tests)</h2>
+  <h2>Rounded Corners (109 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -37,7 +37,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-radius">5.1 Curve Radii: the &#8216;border-radius&#8217; properties</a></th></tr>
-      <!-- 71 tests -->
+      <!-- 72 tests -->
       <tr id="border-bottom-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-bottom-left-radius-001.htm">border-bottom-left-radius-001</a></strong></td>
@@ -478,6 +478,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="border-radius-shorthand-002-5.1" class="primary">
+        <td><strong>
+            <a href="border-radius-shorthand-002.htm">border-radius-shorthand-002</a></strong></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.htm">=</a> </td>
+        <td></td>
+        <td>Borders Radius Shorthand.
+          <ul class="assert">
+            <li>The shorthand border radius property can be used to specify all four eliptical corners of a box.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="border-top-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-top-left-radius-001.htm">border-top-left-radius-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-6.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-6.htm
index 1c3c283c244..621cdd15c8e 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-6.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-6.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Border Images (33 tests)</h2>
+  <h2>Border Images (34 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -112,7 +112,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.2">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-image-slice">6.2 Image Slicing: the &#8216;border-image-slice&#8217; property</a></th></tr>
-      <!-- 4 tests -->
+      <!-- 5 tests -->
       <tr id="border-image-slice-001-6.2" class="primary image">
         <td><strong>
             <a href="border-image-slice-001.htm">border-image-slice-001</a></strong></td>
@@ -146,9 +146,20 @@
           </ul>
         </td>
       </tr>
-      <tr id="border-image-slice-004-6.2" class="primary image">
+      <tr id="border-image-slice-005-6.2" class="primary image">
         <td><strong>
-            <a href="border-image-slice-004.htm">border-image-slice-004</a></strong></td>
+            <a href="border-image-slice-005.htm">border-image-slice-005</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>The 'border-image-slice' property with four percentage values
+          <ul class="assert">
+            <li>This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="border-image-slice-007-6.2" class="primary image">
+        <td><strong>
+            <a href="border-image-slice-007.htm">border-image-slice-007</a></strong></td>
         <td></td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>The 'border-image-slice' property with the 'fill' keyword
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-7.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-7.htm
index 5fa14d03717..28c3ec4744f 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-7.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/chapter-7.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Miscellaneous Effects (10 tests)</h2>
+  <h2>Miscellaneous Effects (11 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -37,15 +37,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-box-shadow">7.1 Drop Shadows: the &#8216;box-shadow&#8217; property</a></th></tr>
-      <!-- 10 tests -->
-      <tr id="box-shadow-001-7.1" class="primary">
+      <!-- 11 tests -->
+      <tr id="box-shadow-001-7.1" class="primary internal">
         <td><strong>
             <a href="box-shadow-001.htm">box-shadow-001</a></strong></td>
-        <td><a href="reference/box-shadow-001-ref.htm">=</a> </td>
         <td></td>
-        <td>Box-Shadow property
+        <td><abbr class="internal" title=""></abbr></td>
+        <td>Positive value of horizontal offset
           <ul class="assert">
-            <li>Testing simple drop shadow with the box-shadow property</li>
+            <li>A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box.</li>
           </ul>
         </td>
       </tr>
@@ -71,6 +71,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="box-shadow-005-7.1" class="primary">
+        <td><strong>
+            <a href="box-shadow-005.htm">box-shadow-005</a></strong></td>
+        <td><a href="reference/box-shadow-005-ref.htm">=</a> </td>
+        <td></td>
+        <td>Box-Shadow property
+          <ul class="assert">
+            <li>Testing simple drop shadow with the box-shadow property</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="box-shadow-blur-definition-001-7.1" class="primary">
         <td><strong>
             <a href="box-shadow-blur-definition-001.htm">box-shadow-blur-definition-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm
new file mode 100644
index 00000000000..6bc14762941
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html><head>
+        <title>CSS Test: Border radius shorthand reference</title>
+        <link href="mailto:arno@arno.org" rel="author" title="arno">
+        <style type="text/css">
+    	/* <![CDATA[ */
+        	div 
+        	{
+				border-top-left-radius: 29px  5px;
+				border-top-right-radius: 43px  11px;
+				border-bottom-left-radius: 13px  17px;
+				border-bottom-right-radius: 19px  23px;
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+			}
+        /* ]]> */
+        </style>
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/box-shadow-001-ref.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/box-shadow-005-ref.htm
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/box-shadow-001-ref.htm
rename to tests/wpt/css-tests/css-backgrounds-3_dev/html4/reference/box-shadow-005-ref.htm
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest-toc.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest-toc.htm
index 7000cd764d7..117484dec6d 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest-toc.htm
@@ -640,6 +640,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="background-repeat-round" class="image">
+      <tr>
+        <td rowspan="1" title="background-repeat:round">
+          <a href="background-repeat-round.htm">background-repeat-round</a></td>
+        <td><a href="reference/background-repeat-round.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="background-repeat-round-roundup" class="image">
       <tr>
         <td rowspan="1" title="background-repeat:round, rounding up">
@@ -1576,6 +1584,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="border-radius-shorthand-002" class="">
+      <tr>
+        <td rowspan="1" title="Borders Radius Shorthand.">
+          <a href="border-radius-shorthand-002.htm">border-radius-shorthand-002</a></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="border-top-left-radius-001" class="">
       <tr>
         <td rowspan="1" title="Borders. Border-top-left-radius using 0 value">
@@ -1736,11 +1752,11 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="box-shadow-001" class="">
+    <tbody id="box-shadow-005" class="">
       <tr>
         <td rowspan="1" title="Box-Shadow property">
-          <a href="box-shadow-001.htm">box-shadow-001</a></td>
-        <td><a href="reference/box-shadow-001-ref.htm">=</a> </td>
+          <a href="box-shadow-005.htm">box-shadow-005</a></td>
+        <td><a href="reference/box-shadow-005-ref.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest.list b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest.list
index 795fec6dfab..b11573853e3 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/reftest.list
@@ -76,6 +76,7 @@ background-paint-order-001.htm == reference/background-paint-order-001-ref.htm
 background-repeat-no-repeat.htm == reference/background-repeat-no-repeat.htm
 background-repeat-repeat-x.htm == reference/background-repeat-repeat-x.htm
 background-repeat-repeat-y.htm == reference/background-repeat-repeat-y.htm
+background-repeat-round.htm == reference/background-repeat-round.htm
 background-repeat-round-roundup.htm == reference/background-repeat-round-roundup.htm
 background-repeat-space.htm == reference/background-repeat-space.htm
 background-size-002.htm == reference/background-size-002-ref.htm
@@ -193,6 +194,7 @@ border-radius-010.htm == reference/border-radius-010-ref.htm
 border-radius-011.htm == reference/border-radius-011-ref.htm
 border-radius-clipping.htm == reference/border-radius-clipping-ref.htm
 border-radius-horizontal-value-is-zero.htm == reference/border-radius-horizontal-value-is-zero-ref.htm
+border-radius-shorthand-002.htm == reference/border-radius-shorthand-002-ref.htm
 border-top-left-radius-001.htm == reference/border-radius-001-ref.htm
 border-top-left-radius-003.htm == border-top-left-radius-004.htm
 border-top-left-radius-004.htm == border-top-left-radius-003.htm
@@ -213,7 +215,7 @@ border-top-right-radius-009.htm == border-top-right-radius-007.htm
 border-top-right-radius-010.htm == reference/border-radius-001-ref.htm
 border-top-right-radius-011.htm == reference/border-radius-001-ref.htm
 border-top-right-radius-014.htm == reference/border-radius-001-ref.htm
-box-shadow-001.htm == reference/box-shadow-001-ref.htm
+box-shadow-005.htm == reference/box-shadow-005-ref.htm
 box-shadow-inset-spread-without-border-radius.htm == reference/box-shadow-inset-spread-without-border-radius.htm
 box-shadow-inset-without-border-radius.htm == reference/box-shadow-inset-without-border-radius.htm
 box-shadow-outset-spread-without-border-radius.htm == reference/box-shadow-outset-spread-without-border-radius.htm
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/toc.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/toc.htm
index 1866476f268..410a5ff6cfb 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/html4/toc.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/html4/toc.htm
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.htm">Chapter 3 - 
         Backgrounds</a></th>
-      <td>(383 Tests)</td></tr>
+      <td>(385 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
@@ -42,17 +42,17 @@
     <tbody id="s5">
       <tr><th><a href="chapter-5.htm">Chapter 5 - 
         Rounded Corners</a></th>
-      <td>(108 Tests)</td></tr>
+      <td>(109 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.htm">Chapter 6 - 
         Border Images</a></th>
-      <td>(33 Tests)</td></tr>
+      <td>(34 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.htm">Chapter 7 - 
         Miscellaneous Effects</a></th>
-      <td>(10 Tests)</td></tr>
+      <td>(11 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.htm">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-backgrounds-3_dev/implementation-report-TEMPLATE.data
index 7c9b0b1a482..fd1bf8abf8b 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/implementation-report-TEMPLATE.data
@@ -201,10 +201,12 @@ html4/background-repeat-repeat-y.htm	5be38e2f02e45a57583bba37adad815886fad866	?
 xhtml1/background-repeat-repeat-y.xht	5be38e2f02e45a57583bba37adad815886fad866	?
 html4/background-repeat-round-001.htm	488d2b77d15b0460f580db27ef68620e29b38709	?
 xhtml1/background-repeat-round-001.xht	488d2b77d15b0460f580db27ef68620e29b38709	?
+html4/background-repeat-round-002.htm	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	?
+xhtml1/background-repeat-round-002.xht	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	?
 html4/background-repeat-round-roundup.htm	e34726ee89c303590c6c76d60d62fbfb3a522858	?
 xhtml1/background-repeat-round-roundup.xht	e34726ee89c303590c6c76d60d62fbfb3a522858	?
-html4/background-repeat-round.htm	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	?
-xhtml1/background-repeat-round.xht	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	?
+html4/background-repeat-round.htm	30a7f3206852c485f18f345482a4664d60ad31f8	?
+xhtml1/background-repeat-round.xht	30a7f3206852c485f18f345482a4664d60ad31f8	?
 html4/background-repeat-space-padding-box.htm	16bd520231befa9ed931f103d28d2ce8745bc65c	?
 xhtml1/background-repeat-space-padding-box.xht	16bd520231befa9ed931f103d28d2ce8745bc65c	?
 html4/background-repeat-space.htm	61acbfe3d798516727be3376412ab8c116a00d50	?
@@ -213,6 +215,8 @@ html4/background-size-001.htm	ae9fed313c355776a869c710b2c96cc066a3d9d0	?
 xhtml1/background-size-001.xht	ae9fed313c355776a869c710b2c96cc066a3d9d0	?
 html4/background-size-002.htm	25c622e0bcbf420d7b5053a9f2efc893505700f6	?
 xhtml1/background-size-002.xht	25c622e0bcbf420d7b5053a9f2efc893505700f6	?
+html4/background-size-003.htm	a9a83cfab328e894706c5fac465f1958bd98d95f	?
+xhtml1/background-size-003.xht	a9a83cfab328e894706c5fac465f1958bd98d95f	?
 html4/background-size-005.htm	5b1eae2d4a42d5dd9ad0d77bfeb06c5450df8636	?
 xhtml1/background-size-005.xht	5b1eae2d4a42d5dd9ad0d77bfeb06c5450df8636	?
 html4/background-size-006.htm	fc850e8bb8486d6c7086c40b535a5f1ba14d9bca	?
@@ -491,8 +495,10 @@ html4/border-image-slice-002.htm	c8d317551460dd21040412489996a6c738894628	?
 xhtml1/border-image-slice-002.xht	c8d317551460dd21040412489996a6c738894628	?
 html4/border-image-slice-003.htm	2a0dfc8496d5d5a90972a635ced57cc9b3a26ea2	?
 xhtml1/border-image-slice-003.xht	2a0dfc8496d5d5a90972a635ced57cc9b3a26ea2	?
-html4/border-image-slice-004.htm	f425ef8e3feb8e574627efb81478a607bd715055	?
-xhtml1/border-image-slice-004.xht	f425ef8e3feb8e574627efb81478a607bd715055	?
+html4/border-image-slice-005.htm	c795fb86f3a99c061832e0c3f708bf7c8650a895	?
+xhtml1/border-image-slice-005.xht	c795fb86f3a99c061832e0c3f708bf7c8650a895	?
+html4/border-image-slice-007.htm	f425ef8e3feb8e574627efb81478a607bd715055	?
+xhtml1/border-image-slice-007.xht	f425ef8e3feb8e574627efb81478a607bd715055	?
 html4/border-image-slice-percentage.htm	96c66681062840b53a027278203512f40dc13523	?
 xhtml1/border-image-slice-percentage.xht	96c66681062840b53a027278203512f40dc13523	?
 html4/border-image-space-001.htm	7f295d8a8471c3a6127a95f0cceb6be824571926	?
@@ -575,6 +581,8 @@ html4/border-radius-overflow-hidden.htm	b387ba83b820a0718c10a1b9e2087971282efde3
 xhtml1/border-radius-overflow-hidden.xht	b387ba83b820a0718c10a1b9e2087971282efde3	?
 html4/border-radius-shorthand-001.htm	c10da19070dbaf8b93b34577df2a0b7187e58bc6	?
 xhtml1/border-radius-shorthand-001.xht	c10da19070dbaf8b93b34577df2a0b7187e58bc6	?
+html4/border-radius-shorthand-002.htm	bfed421505cd493d7968e3149b638a98cc229e7f	?
+xhtml1/border-radius-shorthand-002.xht	bfed421505cd493d7968e3149b638a98cc229e7f	?
 html4/border-radius-style-001.htm	b0f47b7c8b8fb99c43466d068216b2f5b043637e	?
 xhtml1/border-radius-style-001.xht	b0f47b7c8b8fb99c43466d068216b2f5b043637e	?
 html4/border-radius-style-002.htm	93fd139c58650a9b67ddac477b0370a3209c5c49	?
@@ -659,14 +667,16 @@ html4/border-top-right-radius-014.htm	da34f4b7b8e9fa8b5f62323c478a8ce6ca5add2b	?
 xhtml1/border-top-right-radius-014.xht	da34f4b7b8e9fa8b5f62323c478a8ce6ca5add2b	?
 html4/border-top-right-radius-values-004.htm	b0b8efe5ffbb9afb0e6430321784891fd69d1da3	?
 xhtml1/border-top-right-radius-values-004.xht	b0b8efe5ffbb9afb0e6430321784891fd69d1da3	?
-html4/box-shadow-001.htm	5937733dbf81339f32c8be0e25aa99021a4841b9	?
-xhtml1/box-shadow-001.xht	5937733dbf81339f32c8be0e25aa99021a4841b9	?
+html4/box-shadow-001.htm	1c8548de168515500a4953975a935d49352c76d8	?
+xhtml1/box-shadow-001.xht	1c8548de168515500a4953975a935d49352c76d8	?
 html4/box-shadow-002.htm	51e9728d7bb6c05d90f699ee55f11a6aac8c0dc8	?
 xhtml1/box-shadow-002.xht	51e9728d7bb6c05d90f699ee55f11a6aac8c0dc8	?
 html4/box-shadow-003.htm	2e612545b32f7aa9da6ba0fcc4a230f5229ea0c8	?
 xhtml1/box-shadow-003.xht	2e612545b32f7aa9da6ba0fcc4a230f5229ea0c8	?
 html4/box-shadow-004.htm	ab393af60215943f4f47e4a7455d41fe6fb2de5e	?
 xhtml1/box-shadow-004.xht	ab393af60215943f4f47e4a7455d41fe6fb2de5e	?
+html4/box-shadow-005.htm	6f76f6e7f61c8282c602e59357cfc104033595ce	?
+xhtml1/box-shadow-005.xht	6f76f6e7f61c8282c602e59357cfc104033595ce	?
 html4/box-shadow-blur-definition-001.htm	54dbeb7c7726669361ca287a664b40433ccdeace	?
 xhtml1/box-shadow-blur-definition-001.xht	54dbeb7c7726669361ca287a664b40433ccdeace	?
 html4/box-shadow-inset-spread-without-border-radius.htm	f9daf687adc6dd3741682f4b1af08ca29adb97d2	?
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/index.htm b/tests/wpt/css-tests/css-backgrounds-3_dev/index.htm
index 7e30f4498ed..bbc26097356 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/index.htm
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/index.htm
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>anping</li>
+    <li>Arno</li>
     <li>babyliner</li>
     <li>disound</li>
     <li>Dong An</li>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/index.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/index.xht
index 23ab0ef9824..c622f895c6a 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/index.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/index.xht
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>anping</li>
+    <li>Arno</li>
     <li>babyliner</li>
     <li>disound</li>
     <li>Dong An</li>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/testinfo.data b/tests/wpt/css-tests/css-backgrounds-3_dev/testinfo.data
index 7289397fe11..409255021bb 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/testinfo.data
@@ -97,13 +97,15 @@ background-paint-order-001	reference/background-paint-order-001-ref	Background c
 background-repeat-no-repeat	reference/background-repeat-no-repeat	background-repeat:no-repeat	image	http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat,http://www.w3.org/TR/css3-background/#the-background-repeat	11682036f813de6bd77295409e7884259d8d2595	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The image is placed once in the background positioning area and not repeated in any direction.
 background-repeat-repeat-x	reference/background-repeat-repeat-x	background-repeat:repeat-x	image	http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat,http://www.w3.org/TR/css3-background/#the-background-repeat	2045d4adc4d0e306dda4bed6d1f643a92151e211	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The image is repeated horizontally as often as needed to cover the background painting area.
 background-repeat-repeat-y	reference/background-repeat-repeat-y	background-repeat:repeat-y	image	http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat,http://www.w3.org/TR/css3-background/#the-background-repeat	5be38e2f02e45a57583bba37adad815886fad866	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The image is repeated vertically as often as needed to cover the background painting area.
-background-repeat-round		background-repeat: round basic support	image	http://www.w3.org/TR/css3-background/#the-background-repeat	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	`Lea Verou`<http://lea.verou.me>	The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.
+background-repeat-round	reference/background-repeat-round	background-repeat:round	image	http://www.w3.org/TR/css3-background/#the-background-repeat	30a7f3206852c485f18f345482a4664d60ad31f8	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.
 background-repeat-round-001		background-repeat - one round keyword value	image	http://www.w3.org/TR/css3-background/#the-background-repeat	488d2b77d15b0460f580db27ef68620e29b38709	`Intel`<http://www.intel.com>	Check if 'background-repeat' is 'round', then the width and height of the corresponding background image is rescaled so that they fit a whole number of times (2 in this test) in the background positioning area. Therefore the used width and height of the background image in this test should be 110px.
+background-repeat-round-002		background-repeat: round basic support	image	http://www.w3.org/TR/css3-background/#the-background-repeat	1a0c1c29e5c5ad357f96277b024066b65e8dbda8	`Lea Verou`<http://lea.verou.me>	The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.
 background-repeat-round-roundup	reference/background-repeat-round-roundup	background-repeat:round, rounding up	image	http://www.w3.org/TR/css3-background/#the-background-repeat	e34726ee89c303590c6c76d60d62fbfb3a522858	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.
 background-repeat-space	reference/background-repeat-space	background-repeat:space	image	http://www.w3.org/TR/css3-background/#the-background-repeat	61acbfe3d798516727be3376412ab8c116a00d50	`Jeffrey Carl Faden`<http://www.jeffreyatw.com/>	The 'background-repeat: space' declaration must space out images in one or more dimensions so they fit a whole number of times in the background positioning area. The first and last images in each row and column must sit along edge(s) of the background positioning area.
 background-repeat-space-padding-box		'Background-repeat: space' when background positioning area is 'padding-box'		http://www.w3.org/TR/css3-background/#the-background-repeat	16bd520231befa9ed931f103d28d2ce8745bc65c	`Microsoft`<http://www.microsoft.com/>	When 'background-repeat: space' and background positioning area is set to 'padding-box' the image is repeated as often within the 'padding-box' without being clipped, the images are spaced out to fill the area and the first and last images touch the edges of the 'padding-box'.
 background-size-001		background-size - initial and supported values	dom,script	http://www.w3.org/TR/css3-background/#the-background-size	ae9fed313c355776a869c710b2c96cc066a3d9d0	`Intel`<http://www.intel.com>	Check if background-size initial value is auto and supports values auto, cover and contain
 background-size-002	reference/background-size-002-ref	background-size - initial value	image	http://www.w3.org/TR/css3-background/#the-background-size	25c622e0bcbf420d7b5053a9f2efc893505700f6	`Intel`<http://www.intel.com>	Check if 'background-size' with initial value implies to the intrinsic width and height of the image are to be used. Therefore the used width and height of the background-size in this test should be 60px and 60px.
+background-size-003		Value of 'auto' is used for y dimension in 'background-size'		http://www.w3.org/TR/css3-background/#the-background-size	a9a83cfab328e894706c5fac465f1958bd98d95f	`Microsoft`<http://www.microsoft.com/>	An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension.
 background-size-005	reference/background-size-002-ref	background-size - one auto keyword value	image	http://www.w3.org/TR/css3-background/#the-background-size	5b1eae2d4a42d5dd9ad0d77bfeb06c5450df8636	`Intel`<http://www.intel.com>	Check if 'background-size' has only one value 'auto', then such value is the width of the correspoding image and the second value (corresponding to the height of the background image) is assumed to be 'auto'. An 'auto' value for one dimension is resolved by using the image's intrinsic ratio (in this test, the image's intrinsic ratio is 1:1) and (multiplied by) the size of the other dimension. Therefore the used width and height of the background-size in this test should be 60px and 60px.
 background-size-006	reference/background-size-006-ref	background-size - one <length> value	image	http://www.w3.org/TR/css3-background/#the-background-size	fc850e8bb8486d6c7086c40b535a5f1ba14d9bca	`Intel`<http://www.intel.com>	Check if 'background-size' has only one length value, then such value is the width of the corresponding image and the second value (corresponding to the height of the background image) is assumed to be 'auto'. An 'auto' value for one dimension is resolved by using the image's intrinsic ratio (in this test, the image's intrinsic ratio is 1:1) and (multiplied by) the size of the other dimension. Therefore the used height of the background-size in this test should be 45px.
 background-size-007	reference/ref-filled-green-100px-square	background-size - one <length> value at minimum	image	http://www.w3.org/TR/css3-background/#the-background-size	22b9aec99f6bebb1f5d3929f3b615b75d5c72f61	`Intel`<http://www.intel.com>	Check if 'background-size' is '0px', minimum width of the positioning area in length, then such value is the width of the corresponding image and therefore the background image is not to be displayed.
@@ -243,7 +245,8 @@ border-image-round-and-stretch	reference/border-image-round-and-stretch-ref	'bor
 border-image-slice-001	reference/ref-filled-green-100px-square	border-image-slice - <percentage>	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	65c72cac44f48927ec95a402775c42d8f17d480d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Percentage values for 'border-image-slice' are relative to the size of the image: the width of the image for the horizontal (left and right) offsets, the height for vertical (top and bottom) offsets. 'border-image-slice' specifies inward offsets from the top, right, bottom, and left edges (in that order) of the image. In this test, the image serving as 'border-image-source' is a 100px by 100px image which has 5px of green at the top, 10px of green on the right, 15px of green at the bottom and 20px of green at the left; the remaining center (which has a width of 70px and a height of 80px) is all red.
 border-image-slice-002	reference/ref-filled-green-100px-square	border-image-slice - <number>	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	c8d317551460dd21040412489996a6c738894628	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Number values for 'border-image-slice' are pixels in the image: the width of the image for the horizontal (left and right) offsets, the height for vertical (top and bottom) offsets. 'border-image-slice' specifies inward offsets from the top, right, bottom, and left edges (in that order) of the image. In this test, the image serving as 'border-image-source' is a 100px by 100px image which has 5px of green at the top, 10px of green on the right, 15px of green at the bottom and 20px of green at the left; the remaining center (which has a width of 70px and a height of 80px) is all red.
 border-image-slice-003	reference/ref-if-there-is-no-red	border-image-slice - border-style: none	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	2a0dfc8496d5d5a90972a635ced57cc9b3a26ea2	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	If 'border-style' is not declared, then it defaults to 'none' in which case the computed border-widths on all 4 sides is 0 in which case the border area to be painted with the border-image is also 0. So, we should see no red in this test.
-border-image-slice-004		The 'border-image-slice' property with the 'fill' keyword	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	f425ef8e3feb8e574627efb81478a607bd715055	`Microsoft`<http://www.microsoft.com/>	This test checks that the 'fill' keyword, if present, causes the middle part of the border-image to be preserved.
+border-image-slice-005		The 'border-image-slice' property with four percentage values	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	c795fb86f3a99c061832e0c3f708bf7c8650a895	`Microsoft`<http://www.microsoft.com/>	This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets.
+border-image-slice-007		The 'border-image-slice' property with the 'fill' keyword	image	http://www.w3.org/TR/css3-background/#the-border-image-slice	f425ef8e3feb8e574627efb81478a607bd715055	`Microsoft`<http://www.microsoft.com/>	This test checks that the 'fill' keyword, if present, causes the middle part of the border-image to be preserved.
 border-image-slice-percentage	reference/border-image-slice-percentage-ref	'border-image-slice' set by percentage		http://www.w3.org/TR/css3-background/#border-images	96c66681062840b53a027278203512f40dc13523	`Ren Jing`<mailto:reni2046@gmail.com>	diamonds in corners should be red, and other diamonds should be orange, it should be 4 orange diamonds on each side.
 border-image-space-001	reference/border-image-space-001-ref	Border Image: box with spaced repeating border image		http://www.w3.org/TR/css3-background/#the-border-image-repeat	7f295d8a8471c3a6127a95f0cceb6be824571926	`Levi Weintraub`<mailto:leviw@chromium.org>	border-image-repeat: space property spaces out background image that doesn't fit an even number of times.
 border-images		border-images with round repeat	image	http://www.w3.org/TR/css3-background/#the-border-image	4d4052e1cc45e8c09db0459361452d1b5d5fd146	`babyliner`<mailto:babyliner1026@gmail.com>	Testing border-image-repeat:round attribute
@@ -285,6 +288,7 @@ border-radius-initial-value-001		Initial value of 'border-radius' is 0		http://w
 border-radius-not-inherited-001		'Border-radius' is not inherited by default		http://www.w3.org/TR/css3-background/#border-radius	eb45d4478864422c50e2a68c5e329e75268b29d5	`Microsoft`<http://www.microsoft.com/>	'Border-radius' is not inherited by default.
 border-radius-overflow-hidden		Clipping to the border-radius curve		http://www.w3.org/TR/css3-background/#corner-clipping	b387ba83b820a0718c10a1b9e2087971282efde3	`Lea Verou`<http://lea.verou.me>	Effects that clip to the border or padding edge (such as &acirc;&#8364;&#732;overflow&acirc;&#8364;&#8482; other than &acirc;&#8364;&#732;visible&acirc;&#8364;&#8482;) must clip to the curve
 border-radius-shorthand-001		'Border-radius' shorthand is used to set all four 'border-[*]-radius' properties.		http://www.w3.org/TR/css3-background/#border-radius	c10da19070dbaf8b93b34577df2a0b7187e58bc6	`Microsoft`<http://www.microsoft.com/>	'Border-radius' shorthand sets all four 'border-[*]-radius' properties.
+border-radius-shorthand-002	reference/border-radius-shorthand-002-ref	Borders Radius Shorthand.		http://www.w3.org/TR/css3-background/#the-border-radius	bfed421505cd493d7968e3149b638a98cc229e7f	`Arno`<mailto:arno@arno.org>	The shorthand border radius property can be used to specify all four eliptical corners of a box.
 border-radius-style-001		'Border-radius' is set with 'border-style: dotted'		http://www.w3.org/TR/css3-background/#the-border-color	b0f47b7c8b8fb99c43466d068216b2f5b043637e	`Microsoft`<http://www.microsoft.com/>	'Border-style: dotted' follows the curve of the border.
 border-radius-style-002		'Border-radius' is set with 'border-style: dashed'		http://www.w3.org/TR/css3-background/#the-border-style	93fd139c58650a9b67ddac477b0370a3209c5c49	`Microsoft`<http://www.microsoft.com/>	'Border-style: dashed' follows the curve of the border.
 border-radius-style-003		'Border-radius' is set with 'border-style: double'		http://www.w3.org/TR/css3-background/#the-border-style	c518dbdb422a407068f81a2b6f9592a24db4cdce	`Microsoft`<http://www.microsoft.com/>	'Border-style: double' follows the curve of the border.
@@ -327,10 +331,11 @@ border-top-right-radius-012		Borders. Border-top-right-radius using two length v
 border-top-right-radius-013		Borders. Border-top-right-radius using two length values: 40pt 2pc		http://www.w3.org/TR/css3-background/#the-border-radius	3cd7b5e00e8ee28be18076ef7204312707b643da	`Nokia`<http://www.nokia.com/>	To verify border-top-right-radius property sets to two length values (with different units), works fine
 border-top-right-radius-014	reference/border-radius-001-ref	Borders. Border-top-right-radius using two length values: 50px -25px		http://www.w3.org/TR/css3-background/#the-border-radius	da34f4b7b8e9fa8b5f62323c478a8ce6ca5add2b	`Nokia`<http://www.nokia.com/>	To verify if one length value is negative for border-top-right-radius, then the element is not rounded.
 border-top-right-radius-values-004		Percentage for the vertical radius of 'border-top-right-radius' refers to the height of the border box.		http://www.w3.org/TR/css3-background/#border-radius	b0b8efe5ffbb9afb0e6430321784891fd69d1da3	`Microsoft`<http://www.microsoft.com/>	Percentage for the vertical radius of 'border-top-right-radius' refers to the height of the border box.
-box-shadow-001	reference/box-shadow-001-ref	Box-Shadow property		http://www.w3.org/TR/css3-background/#the-box-shadow	5937733dbf81339f32c8be0e25aa99021a4841b9	`Marc Silverman`<mailto:silverman@adobe.com>	Testing simple drop shadow with the box-shadow property
+box-shadow-001		Positive value of horizontal offset	internal	http://www.w3.org/TR/css3-background/#the-box-shadow	1c8548de168515500a4953975a935d49352c76d8	`Microsoft`<http://www.microsoft.com/>	A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box.
 box-shadow-002		Positive values for spread distance		http://www.w3.org/TR/css3-background/#the-box-shadow	51e9728d7bb6c05d90f699ee55f11a6aac8c0dc8	`Microsoft`<http://www.microsoft.com/>	Positive values of the spread distance cause the shadow to grow in all directions by the specified distance.
 box-shadow-003		Layering of box shadows		http://www.w3.org/TR/css3-background/#the-background-size	2e612545b32f7aa9da6ba0fcc4a230f5229ea0c8	`Microsoft`<http://www.microsoft.com/>	Shadow effects are applied front to back, where the first shadow is on the top and the last shadow is on the bottom.
 box-shadow-004		Negative value for blur radius		http://www.w3.org/TR/css3-background/#the-box-shadow	ab393af60215943f4f47e4a7455d41fe6fb2de5e	`Microsoft`<http://www.microsoft.com/>	Negative values for the blur radius of the 'box-shadow' are not allowed.
+box-shadow-005	reference/box-shadow-005-ref	Box-Shadow property		http://www.w3.org/TR/css3-background/#the-box-shadow	6f76f6e7f61c8282c602e59357cfc104033595ce	`Marc Silverman`<mailto:silverman@adobe.com>	Testing simple drop shadow with the box-shadow property
 box-shadow-blur-definition-001		blur computation for box-shadow		http://www.w3.org/TR/css3-background/#the-box-shadow	54dbeb7c7726669361ca287a664b40433ccdeace	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	the resulting shadow must approximate (with each pixel being within 5% of its expected value) the image that would be generated by applying to the shadow a Gaussian blur with a standard deviation equal to half the blur radius
 box-shadow-inset-spread-without-border-radius	reference/box-shadow-inset-spread-without-border-radius	box-shadow		http://www.w3.org/TR/css3-background/#the-box-shadow	f9daf687adc6dd3741682f4b1af08ca29adb97d2	`Zhang Xiaochong`<mailto:joy.xczhang@gmail.com>	inset spread box-shadow should show shadow.
 box-shadow-inset-without-border-radius	reference/box-shadow-inset-without-border-radius	box-shadow		http://www.w3.org/TR/css3-background/#the-box-shadow	de22652b0e7c4a3bc482f6968be7081c378247f8	`Zhang Xiaochong`<mailto:joy.xczhang@gmail.com>	inset box-shadow should show shadow.
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round-002.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round-002.xht
new file mode 100644
index 00000000000..df367c01dc1
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round-002.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><!-- Submitted from TestTWF Paris --><head>
+
+<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
+<link href="http://lea.verou.me" rel="author" title="Lea Verou" />
+<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help" />
+<meta content="image" name="flags" />
+<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert" />
+<style>
+
+html {
+	background: red url('support/swatch-green.png') no-repeat;
+	background-repeat: round;
+}
+
+</style>
+
+</head>
+<body>
+
+<p>Test passes if there is green and <strong>no red</strong>.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht
index df367c01dc1..48928b13ee9 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht
@@ -1,25 +1,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!-- Submitted from TestTWF Paris --><head>
-
-<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
-<link href="http://lea.verou.me" rel="author" title="Lea Verou" />
-<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help" />
-<meta content="image" name="flags" />
-<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert" />
-<style>
-
-html {
-	background: red url('support/swatch-green.png') no-repeat;
-	background-repeat: round;
-}
-
-</style>
-
-</head>
-<body>
-
-<p>Test passes if there is green and <strong>no red</strong>.</p>
-
-
-
-</body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>CSS Test: background-repeat:round</title>
+    <link rel="author" title="Jeffrey Carl Faden" href="http://www.jeffreyatw.com/" />
+    <link rel="match" href="reference/background-repeat-round.xht" />
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-repeat" />
+    <meta name="flags" content="image" />
+    <meta name="assert" content="The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area." />
+    <style type="text/css">
+      <![CDATA[
+      div {
+        background-image: url("support/rectangle-96x60.png");
+        background-repeat: round;
+        height: 204px;
+        width: 236px;
+      }
+      ]]>
+    </style>
+  </head>
+  <body>
+    <p><img src="support/rectangle-96x60.png" alt="Image download support must be enabled" /></p>
+    <p>Test passes if the above image repeats in the below rectangle 6 times exactly: 2 columns, 3 rows. The top border of the containing rectangle should be orange, the right border yellow, the bottom border green, and the left border blue.</p>
+    <p>Test fails if the above image repeats in below rectangle more than 6 times, with partial images lining the right and the bottom.</p>
+    <div></div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-size-003.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-size-003.xht
new file mode 100644
index 00000000000..870aeddfc92
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/background-size-003.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Value of 'auto' is used for y dimension in 'background-size'</title> 
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-background-size" rel="help" />
+        <meta content="" name="flags" />
+        <meta content="An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension." name="assert" />
+        <style type="text/css">
+            .test
+            {
+                width: 100px;
+                height: 100px;
+                background-repeat: no-repeat;
+                background-image: url("support/red_color.png");
+                background-size: 50px auto;
+            }
+            .reference
+            {
+                margin-top: -100px;
+                background: black;
+                width: 50px;
+                height: 50px;
+            }
+        </style>
+        </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p> 
+        <div class="test"></div>
+        <div class="reference"></div>
+    
+ 
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-005.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-005.xht
new file mode 100644
index 00000000000..ac1f7064f34
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-005.xht
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: The 'border-image-slice' property with four percentage values</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-border-image-slice" rel="help" />
+        <meta content="image" name="flags" />
+        <meta content="This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets." name="assert" />
+        <style type="text/css">
+            div
+            {
+                border: 40px double red;
+                border-image-slice: 40% 15% 20% 5%;
+                border-image-source: url("../support/9grid40-30-20-10-red.png");
+                height: 100px;
+                margin: 50px;
+                width: 200px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-004.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-007.xht
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-004.xht
rename to tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-image-slice-007.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht
new file mode 100644
index 00000000000..36d5969f322
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Borders Radius Shorthand. </title>
+        <link href="mailto:arno@arno.org" rel="author" title="Arno" />
+        <link href="http://www.w3.org/TR/css3-background/#the-border-radius" rel="help" />
+        <link href="reference/border-radius-shorthand-002-ref.xht" rel="match" />
+        <meta content="" name="flags" />
+        <meta content="The shorthand border radius property can be used to specify all four eliptical corners of a box." name="assert" />
+        <style type="text/css"> 
+        /* &lt;![CDATA[ */
+        	div 
+            {
+				border-radius: 29px  43px 19px 13px / 5px 11px 23px 17px;
+
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+        	}
+        /* ]]&gt; */ 
+        </style>
+
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+
+    
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht
index f2f15c37ea9..91fdc855a46 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht
@@ -1,36 +1,32 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
-    <title>CSS Test Background: Box-Shadow property</title>
-    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman" />
-    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
-    <link href="reference/box-shadow-001-ref.xht" rel="match" />
-    <meta content="Testing simple drop shadow with the box-shadow property" name="assert" />
-    <style type="text/css">
-      #shadow-div {
-	 position: absolute;
-	 top: 50px;
-	 left: 5px;
-	 box-shadow: rgba(0,255,0,1) 10px 10px;
-	 background-color: #000;
-	 width: 144px;
-	 height: 144px;
-	 }
-	 #error {
-	 position: absolute;
-	 top: 60px;
-	 left: 15px;
-	 background-color: red;
-	 width: 144px;
-	 height: 144px;
-	 }
-    </style>
-</head>
-<body>
-    <p>The test passes if there is a green drop shadow and no red.</p>
-    <div id="error">
-    </div>
-    <div id="shadow-div">
-    </div>
-
-
+        <title>CSS Test: Positive value of horizontal offset</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
+        <meta content="internal" name="flags" />
+        <meta content="A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box." name="assert" />
+        <style type="text/css">
+            #reference
+            {
+                width: 2in;
+                height: 1in;
+                background: red;
+                border: thin solid black;
+            }
+            div div
+            {
+                width: 1in;
+                height: 1in;
+                border: thin solid black;
+                background: white;
+                box-shadow: black 96px 0px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div id="reference">
+            <div></div>
+        </div>
+    
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht
new file mode 100644
index 00000000000..9a079fc56e4
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <title>CSS Test Background: Box-Shadow property</title>
+    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman" />
+    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
+    <link href="reference/box-shadow-005-ref.xht" rel="match" />
+    <meta content="Testing simple drop shadow with the box-shadow property" name="assert" />
+    <style type="text/css">
+      #shadow-div {
+	 position: absolute;
+	 top: 50px;
+	 left: 5px;
+	 box-shadow: rgba(0,255,0,1) 10px 10px;
+	 background-color: #000;
+	 width: 144px;
+	 height: 144px;
+	 }
+	 #error {
+	 position: absolute;
+	 top: 60px;
+	 left: 15px;
+	 background-color: red;
+	 width: 144px;
+	 height: 144px;
+	 }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green drop shadow and no red.</p>
+    <div id="error">
+    </div>
+    <div id="shadow-div">
+    </div>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-3.xht
index 8622525a3ee..313bbe23ac5 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Backgrounds (383 tests)</h2>
+  <h2>Backgrounds (385 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -271,7 +271,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.4">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-repeat">3.4 Tiling Images: the &#8216;background-repeat&#8217; property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 23 tests -->
       <tr id="background-003-3.4" class="image">
         <td>
             <a href="background-003.xht">background-003</a></td>
@@ -385,11 +385,11 @@
       <tr id="background-repeat-round-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round.xht">background-repeat-round</a></strong></td>
-        <td></td>
+        <td><a href="reference/background-repeat-round.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>background-repeat: round basic support
+        <td>background-repeat:round
           <ul class="assert">
-            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+            <li>The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.</li>
           </ul>
         </td>
       </tr>
@@ -404,6 +404,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-repeat-round-002-3.4" class="primary image">
+        <td><strong>
+            <a href="background-repeat-round-002.xht">background-repeat-round-002</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>background-repeat: round basic support
+          <ul class="assert">
+            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-repeat-round-roundup-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round-roundup.xht">background-repeat-round-roundup</a></strong></td>
@@ -1502,7 +1513,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.9">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-size">3.9 Sizing Images: the &#8216;background-size&#8217; property</a></th></tr>
-      <!-- 262 tests -->
+      <!-- 263 tests -->
       <tr id="background-intrinsic-001-3.9" class="svg">
         <td>
             <a href="background-intrinsic-001.xht">background-intrinsic-001</a></td>
@@ -1635,6 +1646,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-size-003-3.9" class="primary">
+        <td><strong>
+            <a href="background-size-003.xht">background-size-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Value of 'auto' is used for y dimension in 'background-size'
+          <ul class="assert">
+            <li>An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-size-005-3.9" class="primary image">
         <td><strong>
             <a href="background-size-005.xht">background-size-005</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-5.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-5.xht
index 9fbf996f410..eb2028321d6 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-5.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Rounded Corners (108 tests)</h2>
+  <h2>Rounded Corners (109 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -37,7 +37,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-radius">5.1 Curve Radii: the &#8216;border-radius&#8217; properties</a></th></tr>
-      <!-- 71 tests -->
+      <!-- 72 tests -->
       <tr id="border-bottom-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-bottom-left-radius-001.xht">border-bottom-left-radius-001</a></strong></td>
@@ -478,6 +478,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="border-radius-shorthand-002-5.1" class="primary">
+        <td><strong>
+            <a href="border-radius-shorthand-002.xht">border-radius-shorthand-002</a></strong></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.xht">=</a> </td>
+        <td></td>
+        <td>Borders Radius Shorthand.
+          <ul class="assert">
+            <li>The shorthand border radius property can be used to specify all four eliptical corners of a box.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="border-top-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-top-left-radius-001.xht">border-top-left-radius-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-6.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-6.xht
index 7f6e1a79e38..d123aae3560 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-6.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Border Images (33 tests)</h2>
+  <h2>Border Images (34 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -112,7 +112,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.2">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-image-slice">6.2 Image Slicing: the &#8216;border-image-slice&#8217; property</a></th></tr>
-      <!-- 4 tests -->
+      <!-- 5 tests -->
       <tr id="border-image-slice-001-6.2" class="primary image">
         <td><strong>
             <a href="border-image-slice-001.xht">border-image-slice-001</a></strong></td>
@@ -146,9 +146,20 @@
           </ul>
         </td>
       </tr>
-      <tr id="border-image-slice-004-6.2" class="primary image">
+      <tr id="border-image-slice-005-6.2" class="primary image">
         <td><strong>
-            <a href="border-image-slice-004.xht">border-image-slice-004</a></strong></td>
+            <a href="border-image-slice-005.xht">border-image-slice-005</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>The 'border-image-slice' property with four percentage values
+          <ul class="assert">
+            <li>This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="border-image-slice-007-6.2" class="primary image">
+        <td><strong>
+            <a href="border-image-slice-007.xht">border-image-slice-007</a></strong></td>
         <td></td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>The 'border-image-slice' property with the 'fill' keyword
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-7.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-7.xht
index 7da0fd0d205..c0a2527074f 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-7.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Miscellaneous Effects (10 tests)</h2>
+  <h2>Miscellaneous Effects (11 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -37,15 +37,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-box-shadow">7.1 Drop Shadows: the &#8216;box-shadow&#8217; property</a></th></tr>
-      <!-- 10 tests -->
-      <tr id="box-shadow-001-7.1" class="primary">
+      <!-- 11 tests -->
+      <tr id="box-shadow-001-7.1" class="primary internal">
         <td><strong>
             <a href="box-shadow-001.xht">box-shadow-001</a></strong></td>
-        <td><a href="reference/box-shadow-001-ref.xht">=</a> </td>
         <td></td>
-        <td>Box-Shadow property
+        <td><abbr class="internal" title=""></abbr></td>
+        <td>Positive value of horizontal offset
           <ul class="assert">
-            <li>Testing simple drop shadow with the box-shadow property</li>
+            <li>A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box.</li>
           </ul>
         </td>
       </tr>
@@ -71,6 +71,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="box-shadow-005-7.1" class="primary">
+        <td><strong>
+            <a href="box-shadow-005.xht">box-shadow-005</a></strong></td>
+        <td><a href="reference/box-shadow-005-ref.xht">=</a> </td>
+        <td></td>
+        <td>Box-Shadow property
+          <ul class="assert">
+            <li>Testing simple drop shadow with the box-shadow property</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="box-shadow-blur-definition-001-7.1" class="primary">
         <td><strong>
             <a href="box-shadow-blur-definition-001.xht">box-shadow-blur-definition-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht
new file mode 100644
index 00000000000..701d0269067
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Border radius shorthand reference</title>
+        <link href="mailto:arno@arno.org" rel="author" title="arno" />
+        <style type="text/css">
+    	/* &lt;![CDATA[ */
+        	div 
+        	{
+				border-top-left-radius: 29px  5px;
+				border-top-right-radius: 43px  11px;
+				border-bottom-left-radius: 13px  17px;
+				border-bottom-right-radius: 19px  23px;
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+			}
+        /* ]]&gt; */
+        </style>
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/box-shadow-001-ref.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/box-shadow-005-ref.xht
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/box-shadow-001-ref.xht
rename to tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reference/box-shadow-005-ref.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest-toc.xht
index 156c268db68..273b1be63d4 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest-toc.xht
@@ -640,6 +640,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="background-repeat-round" class="image">
+      <tr>
+        <td rowspan="1" title="background-repeat:round">
+          <a href="background-repeat-round.xht">background-repeat-round</a></td>
+        <td><a href="reference/background-repeat-round.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="background-repeat-round-roundup" class="image">
       <tr>
         <td rowspan="1" title="background-repeat:round, rounding up">
@@ -1576,6 +1584,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="border-radius-shorthand-002" class="">
+      <tr>
+        <td rowspan="1" title="Borders Radius Shorthand.">
+          <a href="border-radius-shorthand-002.xht">border-radius-shorthand-002</a></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="border-top-left-radius-001" class="">
       <tr>
         <td rowspan="1" title="Borders. Border-top-left-radius using 0 value">
@@ -1736,11 +1752,11 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="box-shadow-001" class="">
+    <tbody id="box-shadow-005" class="">
       <tr>
         <td rowspan="1" title="Box-Shadow property">
-          <a href="box-shadow-001.xht">box-shadow-001</a></td>
-        <td><a href="reference/box-shadow-001-ref.xht">=</a> </td>
+          <a href="box-shadow-005.xht">box-shadow-005</a></td>
+        <td><a href="reference/box-shadow-005-ref.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest.list
index ac722c42662..c26b9b3013f 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/reftest.list
@@ -76,6 +76,7 @@ background-paint-order-001.xht == reference/background-paint-order-001-ref.xht
 background-repeat-no-repeat.xht == reference/background-repeat-no-repeat.xht
 background-repeat-repeat-x.xht == reference/background-repeat-repeat-x.xht
 background-repeat-repeat-y.xht == reference/background-repeat-repeat-y.xht
+background-repeat-round.xht == reference/background-repeat-round.xht
 background-repeat-round-roundup.xht == reference/background-repeat-round-roundup.xht
 background-repeat-space.xht == reference/background-repeat-space.xht
 background-size-002.xht == reference/background-size-002-ref.xht
@@ -193,6 +194,7 @@ border-radius-010.xht == reference/border-radius-010-ref.xht
 border-radius-011.xht == reference/border-radius-011-ref.xht
 border-radius-clipping.xht == reference/border-radius-clipping-ref.xht
 border-radius-horizontal-value-is-zero.xht == reference/border-radius-horizontal-value-is-zero-ref.xht
+border-radius-shorthand-002.xht == reference/border-radius-shorthand-002-ref.xht
 border-top-left-radius-001.xht == reference/border-radius-001-ref.xht
 border-top-left-radius-003.xht == border-top-left-radius-004.xht
 border-top-left-radius-004.xht == border-top-left-radius-003.xht
@@ -213,7 +215,7 @@ border-top-right-radius-009.xht == border-top-right-radius-007.xht
 border-top-right-radius-010.xht == reference/border-radius-001-ref.xht
 border-top-right-radius-011.xht == reference/border-radius-001-ref.xht
 border-top-right-radius-014.xht == reference/border-radius-001-ref.xht
-box-shadow-001.xht == reference/box-shadow-001-ref.xht
+box-shadow-005.xht == reference/box-shadow-005-ref.xht
 box-shadow-inset-spread-without-border-radius.xht == reference/box-shadow-inset-spread-without-border-radius.xht
 box-shadow-inset-without-border-radius.xht == reference/box-shadow-inset-without-border-radius.xht
 box-shadow-outset-spread-without-border-radius.xht == reference/box-shadow-outset-spread-without-border-radius.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/toc.xht
index 844eff6d782..44bec7254da 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1/toc.xht
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Backgrounds</a></th>
-      <td>(383 Tests)</td></tr>
+      <td>(385 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
@@ -42,17 +42,17 @@
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
         Rounded Corners</a></th>
-      <td>(108 Tests)</td></tr>
+      <td>(109 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         Border Images</a></th>
-      <td>(33 Tests)</td></tr>
+      <td>(34 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Miscellaneous Effects</a></th>
-      <td>(10 Tests)</td></tr>
+      <td>(11 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round-002.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round-002.xht
new file mode 100644
index 00000000000..df367c01dc1
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round-002.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><!-- Submitted from TestTWF Paris --><head>
+
+<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
+<link href="http://lea.verou.me" rel="author" title="Lea Verou" />
+<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help" />
+<meta content="image" name="flags" />
+<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert" />
+<style>
+
+html {
+	background: red url('support/swatch-green.png') no-repeat;
+	background-repeat: round;
+}
+
+</style>
+
+</head>
+<body>
+
+<p>Test passes if there is green and <strong>no red</strong>.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht
index df367c01dc1..b7dc64e992b 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht
@@ -1,25 +1,36 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!-- Submitted from TestTWF Paris --><head>
-
-<title>CSS Backgrounds and Borders Test: background-repeat: round basic support</title>
-<link href="http://lea.verou.me" rel="author" title="Lea Verou" />
-<link href="http://www.w3.org/TR/css3-background/#the-background-repeat" rel="help" />
-<meta content="image" name="flags" />
-<meta content="The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does." name="assert" />
-<style>
-
-html {
-	background: red url('support/swatch-green.png') no-repeat;
-	background-repeat: round;
-}
-
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>CSS Test: background-repeat:round</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Backgrounds and Borders Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test background-repeat-round"; }
+            @bottom-right { content: counter(page); }
+          }
 </style>
-
-</head>
-<body>
-
-<p>Test passes if there is green and <strong>no red</strong>.</p>
-
-
-
-</body></html>
\ No newline at end of file
+    <link rel="author" title="Jeffrey Carl Faden" href="http://www.jeffreyatw.com/" />
+    <link rel="match" href="reference/background-repeat-round.xht" />
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-repeat" />
+    <meta name="flags" content="image" />
+    <meta name="assert" content="The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area." />
+    <style type="text/css">
+      <![CDATA[
+      div {
+        background-image: url("support/rectangle-96x60.png");
+        background-repeat: round;
+        height: 204px;
+        width: 236px;
+      }
+      ]]>
+    </style>
+  </head>
+  <body>
+    <p><img src="support/rectangle-96x60.png" alt="Image download support must be enabled" /></p>
+    <p>Test passes if the above image repeats in the below rectangle 6 times exactly: 2 columns, 3 rows. The top border of the containing rectangle should be orange, the right border yellow, the bottom border green, and the left border blue.</p>
+    <p>Test fails if the above image repeats in below rectangle more than 6 times, with partial images lining the right and the bottom.</p>
+    <div></div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-size-003.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-size-003.xht
new file mode 100644
index 00000000000..870aeddfc92
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/background-size-003.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Value of 'auto' is used for y dimension in 'background-size'</title> 
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-background-size" rel="help" />
+        <meta content="" name="flags" />
+        <meta content="An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension." name="assert" />
+        <style type="text/css">
+            .test
+            {
+                width: 100px;
+                height: 100px;
+                background-repeat: no-repeat;
+                background-image: url("support/red_color.png");
+                background-size: 50px auto;
+            }
+            .reference
+            {
+                margin-top: -100px;
+                background: black;
+                width: 50px;
+                height: 50px;
+            }
+        </style>
+        </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p> 
+        <div class="test"></div>
+        <div class="reference"></div>
+    
+ 
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-005.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-005.xht
new file mode 100644
index 00000000000..ac1f7064f34
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-005.xht
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: The 'border-image-slice' property with four percentage values</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-border-image-slice" rel="help" />
+        <meta content="image" name="flags" />
+        <meta content="This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets." name="assert" />
+        <style type="text/css">
+            div
+            {
+                border: 40px double red;
+                border-image-slice: 40% 15% 20% 5%;
+                border-image-source: url("../support/9grid40-30-20-10-red.png");
+                height: 100px;
+                margin: 50px;
+                width: 200px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-004.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-007.xht
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-004.xht
rename to tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-image-slice-007.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht
new file mode 100644
index 00000000000..36d5969f322
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Borders Radius Shorthand. </title>
+        <link href="mailto:arno@arno.org" rel="author" title="Arno" />
+        <link href="http://www.w3.org/TR/css3-background/#the-border-radius" rel="help" />
+        <link href="reference/border-radius-shorthand-002-ref.xht" rel="match" />
+        <meta content="" name="flags" />
+        <meta content="The shorthand border radius property can be used to specify all four eliptical corners of a box." name="assert" />
+        <style type="text/css"> 
+        /* &lt;![CDATA[ */
+        	div 
+            {
+				border-radius: 29px  43px 19px 13px / 5px 11px 23px 17px;
+
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+        	}
+        /* ]]&gt; */ 
+        </style>
+
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+
+    
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht
index f2f15c37ea9..91fdc855a46 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht
@@ -1,36 +1,32 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
-    <title>CSS Test Background: Box-Shadow property</title>
-    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman" />
-    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
-    <link href="reference/box-shadow-001-ref.xht" rel="match" />
-    <meta content="Testing simple drop shadow with the box-shadow property" name="assert" />
-    <style type="text/css">
-      #shadow-div {
-	 position: absolute;
-	 top: 50px;
-	 left: 5px;
-	 box-shadow: rgba(0,255,0,1) 10px 10px;
-	 background-color: #000;
-	 width: 144px;
-	 height: 144px;
-	 }
-	 #error {
-	 position: absolute;
-	 top: 60px;
-	 left: 15px;
-	 background-color: red;
-	 width: 144px;
-	 height: 144px;
-	 }
-    </style>
-</head>
-<body>
-    <p>The test passes if there is a green drop shadow and no red.</p>
-    <div id="error">
-    </div>
-    <div id="shadow-div">
-    </div>
-
-
+        <title>CSS Test: Positive value of horizontal offset</title>
+        <link href="http://www.microsoft.com/" rel="author" title="Microsoft" />
+        <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
+        <meta content="internal" name="flags" />
+        <meta content="A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box." name="assert" />
+        <style type="text/css">
+            #reference
+            {
+                width: 2in;
+                height: 1in;
+                background: red;
+                border: thin solid black;
+            }
+            div div
+            {
+                width: 1in;
+                height: 1in;
+                border: thin solid black;
+                background: white;
+                box-shadow: black 96px 0px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div id="reference">
+            <div></div>
+        </div>
+    
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht
new file mode 100644
index 00000000000..9a079fc56e4
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <title>CSS Test Background: Box-Shadow property</title>
+    <link href="mailto:silverman@adobe.com" rel="author" title="Marc Silverman" />
+    <link href="http://www.w3.org/TR/css3-background/#the-box-shadow" rel="help" />
+    <link href="reference/box-shadow-005-ref.xht" rel="match" />
+    <meta content="Testing simple drop shadow with the box-shadow property" name="assert" />
+    <style type="text/css">
+      #shadow-div {
+	 position: absolute;
+	 top: 50px;
+	 left: 5px;
+	 box-shadow: rgba(0,255,0,1) 10px 10px;
+	 background-color: #000;
+	 width: 144px;
+	 height: 144px;
+	 }
+	 #error {
+	 position: absolute;
+	 top: 60px;
+	 left: 15px;
+	 background-color: red;
+	 width: 144px;
+	 height: 144px;
+	 }
+    </style>
+</head>
+<body>
+    <p>The test passes if there is a green drop shadow and no red.</p>
+    <div id="error">
+    </div>
+    <div id="shadow-div">
+    </div>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-3.xht
index 8622525a3ee..313bbe23ac5 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Backgrounds (383 tests)</h2>
+  <h2>Backgrounds (385 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -271,7 +271,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.4">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-repeat">3.4 Tiling Images: the &#8216;background-repeat&#8217; property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 23 tests -->
       <tr id="background-003-3.4" class="image">
         <td>
             <a href="background-003.xht">background-003</a></td>
@@ -385,11 +385,11 @@
       <tr id="background-repeat-round-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round.xht">background-repeat-round</a></strong></td>
-        <td></td>
+        <td><a href="reference/background-repeat-round.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>background-repeat: round basic support
+        <td>background-repeat:round
           <ul class="assert">
-            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+            <li>The 'background-repeat: round' declaration must scale an image in one or more dimensions so it fits a whole number of times in the background positioning area.</li>
           </ul>
         </td>
       </tr>
@@ -404,6 +404,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-repeat-round-002-3.4" class="primary image">
+        <td><strong>
+            <a href="background-repeat-round-002.xht">background-repeat-round-002</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>background-repeat: round basic support
+          <ul class="assert">
+            <li>The image is repeated as often as will fit within the background positioning area. If it doesn't fit a whole number of times, it is rescaled so that it does.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-repeat-round-roundup-3.4" class="primary image">
         <td><strong>
             <a href="background-repeat-round-roundup.xht">background-repeat-round-roundup</a></strong></td>
@@ -1502,7 +1513,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.9">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-background-size">3.9 Sizing Images: the &#8216;background-size&#8217; property</a></th></tr>
-      <!-- 262 tests -->
+      <!-- 263 tests -->
       <tr id="background-intrinsic-001-3.9" class="svg">
         <td>
             <a href="background-intrinsic-001.xht">background-intrinsic-001</a></td>
@@ -1635,6 +1646,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="background-size-003-3.9" class="primary">
+        <td><strong>
+            <a href="background-size-003.xht">background-size-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Value of 'auto' is used for y dimension in 'background-size'
+          <ul class="assert">
+            <li>An 'auto' value for y dimension in 'background-size' is resolved by using the image's intrinsic ratio and the size provided for the x dimension.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="background-size-005-3.9" class="primary image">
         <td><strong>
             <a href="background-size-005.xht">background-size-005</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-5.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-5.xht
index 9fbf996f410..eb2028321d6 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-5.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Rounded Corners (108 tests)</h2>
+  <h2>Rounded Corners (109 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -37,7 +37,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-radius">5.1 Curve Radii: the &#8216;border-radius&#8217; properties</a></th></tr>
-      <!-- 71 tests -->
+      <!-- 72 tests -->
       <tr id="border-bottom-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-bottom-left-radius-001.xht">border-bottom-left-radius-001</a></strong></td>
@@ -478,6 +478,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="border-radius-shorthand-002-5.1" class="primary">
+        <td><strong>
+            <a href="border-radius-shorthand-002.xht">border-radius-shorthand-002</a></strong></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.xht">=</a> </td>
+        <td></td>
+        <td>Borders Radius Shorthand.
+          <ul class="assert">
+            <li>The shorthand border radius property can be used to specify all four eliptical corners of a box.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="border-top-left-radius-001-5.1" class="primary">
         <td><strong>
             <a href="border-top-left-radius-001.xht">border-top-left-radius-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-6.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-6.xht
index 7f6e1a79e38..d123aae3560 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-6.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Border Images (33 tests)</h2>
+  <h2>Border Images (34 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -112,7 +112,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.2">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-border-image-slice">6.2 Image Slicing: the &#8216;border-image-slice&#8217; property</a></th></tr>
-      <!-- 4 tests -->
+      <!-- 5 tests -->
       <tr id="border-image-slice-001-6.2" class="primary image">
         <td><strong>
             <a href="border-image-slice-001.xht">border-image-slice-001</a></strong></td>
@@ -146,9 +146,20 @@
           </ul>
         </td>
       </tr>
-      <tr id="border-image-slice-004-6.2" class="primary image">
+      <tr id="border-image-slice-005-6.2" class="primary image">
         <td><strong>
-            <a href="border-image-slice-004.xht">border-image-slice-004</a></strong></td>
+            <a href="border-image-slice-005.xht">border-image-slice-005</a></strong></td>
+        <td></td>
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>The 'border-image-slice' property with four percentage values
+          <ul class="assert">
+            <li>This test checks that the border image is sliced into nine regions with inward offsets, '40%' from the top, '15%' from the right,'20%' from the bottom, and '5%' from the left edges of the image. Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="border-image-slice-007-6.2" class="primary image">
+        <td><strong>
+            <a href="border-image-slice-007.xht">border-image-slice-007</a></strong></td>
         <td></td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>The 'border-image-slice' property with the 'fill' keyword
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-7.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-7.xht
index 7da0fd0d205..c0a2527074f 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-7.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Backgrounds and Borders Module Level 3 CR Test Suite</h1>
-  <h2>Miscellaneous Effects (10 tests)</h2>
+  <h2>Miscellaneous Effects (11 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -37,15 +37,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1">+</a>
         <a href="http://www.w3.org/TR/css3-background/#the-box-shadow">7.1 Drop Shadows: the &#8216;box-shadow&#8217; property</a></th></tr>
-      <!-- 10 tests -->
-      <tr id="box-shadow-001-7.1" class="primary">
+      <!-- 11 tests -->
+      <tr id="box-shadow-001-7.1" class="primary internal">
         <td><strong>
             <a href="box-shadow-001.xht">box-shadow-001</a></strong></td>
-        <td><a href="reference/box-shadow-001-ref.xht">=</a> </td>
         <td></td>
-        <td>Box-Shadow property
+        <td><abbr class="internal" title=""></abbr></td>
+        <td>Positive value of horizontal offset
           <ul class="assert">
-            <li>Testing simple drop shadow with the box-shadow property</li>
+            <li>A positive value for the horizontal offset of the 'box-shadow' draws a shadow that is offset to the right of the box.</li>
           </ul>
         </td>
       </tr>
@@ -71,6 +71,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="box-shadow-005-7.1" class="primary">
+        <td><strong>
+            <a href="box-shadow-005.xht">box-shadow-005</a></strong></td>
+        <td><a href="reference/box-shadow-005-ref.xht">=</a> </td>
+        <td></td>
+        <td>Box-Shadow property
+          <ul class="assert">
+            <li>Testing simple drop shadow with the box-shadow property</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="box-shadow-blur-definition-001-7.1" class="primary">
         <td><strong>
             <a href="box-shadow-blur-definition-001.xht">box-shadow-blur-definition-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht
new file mode 100644
index 00000000000..701d0269067
--- /dev/null
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+        <title>CSS Test: Border radius shorthand reference</title>
+        <link href="mailto:arno@arno.org" rel="author" title="arno" />
+        <style type="text/css">
+    	/* &lt;![CDATA[ */
+        	div 
+        	{
+				border-top-left-radius: 29px  5px;
+				border-top-right-radius: 43px  11px;
+				border-bottom-left-radius: 13px  17px;
+				border-bottom-right-radius: 19px  23px;
+        		background:	#dddddd;
+        		width:		200px;
+        		height: 	100px;
+			}
+        /* ]]&gt; */
+        </style>
+    </head>
+    <body>
+    	<p>
+			There should be one box, with four rounded corners, each corner a different radius.
+		</p>
+		<ul>
+			<li>PASS if the box below has four rounded corners.</li>
+			<li>FAIL if the corners are not rounded.</li>
+		</ul>
+    	
+    	<div></div>
+    
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-001-ref.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-005-ref.xht
similarity index 100%
rename from tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-001-ref.xht
rename to tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-005-ref.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest-toc.xht
index 156c268db68..273b1be63d4 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest-toc.xht
@@ -640,6 +640,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="background-repeat-round" class="image">
+      <tr>
+        <td rowspan="1" title="background-repeat:round">
+          <a href="background-repeat-round.xht">background-repeat-round</a></td>
+        <td><a href="reference/background-repeat-round.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="background-repeat-round-roundup" class="image">
       <tr>
         <td rowspan="1" title="background-repeat:round, rounding up">
@@ -1576,6 +1584,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="border-radius-shorthand-002" class="">
+      <tr>
+        <td rowspan="1" title="Borders Radius Shorthand.">
+          <a href="border-radius-shorthand-002.xht">border-radius-shorthand-002</a></td>
+        <td><a href="reference/border-radius-shorthand-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="border-top-left-radius-001" class="">
       <tr>
         <td rowspan="1" title="Borders. Border-top-left-radius using 0 value">
@@ -1736,11 +1752,11 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="box-shadow-001" class="">
+    <tbody id="box-shadow-005" class="">
       <tr>
         <td rowspan="1" title="Box-Shadow property">
-          <a href="box-shadow-001.xht">box-shadow-001</a></td>
-        <td><a href="reference/box-shadow-001-ref.xht">=</a> </td>
+          <a href="box-shadow-005.xht">box-shadow-005</a></td>
+        <td><a href="reference/box-shadow-005-ref.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest.list
index ac722c42662..c26b9b3013f 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/reftest.list
@@ -76,6 +76,7 @@ background-paint-order-001.xht == reference/background-paint-order-001-ref.xht
 background-repeat-no-repeat.xht == reference/background-repeat-no-repeat.xht
 background-repeat-repeat-x.xht == reference/background-repeat-repeat-x.xht
 background-repeat-repeat-y.xht == reference/background-repeat-repeat-y.xht
+background-repeat-round.xht == reference/background-repeat-round.xht
 background-repeat-round-roundup.xht == reference/background-repeat-round-roundup.xht
 background-repeat-space.xht == reference/background-repeat-space.xht
 background-size-002.xht == reference/background-size-002-ref.xht
@@ -193,6 +194,7 @@ border-radius-010.xht == reference/border-radius-010-ref.xht
 border-radius-011.xht == reference/border-radius-011-ref.xht
 border-radius-clipping.xht == reference/border-radius-clipping-ref.xht
 border-radius-horizontal-value-is-zero.xht == reference/border-radius-horizontal-value-is-zero-ref.xht
+border-radius-shorthand-002.xht == reference/border-radius-shorthand-002-ref.xht
 border-top-left-radius-001.xht == reference/border-radius-001-ref.xht
 border-top-left-radius-003.xht == border-top-left-radius-004.xht
 border-top-left-radius-004.xht == border-top-left-radius-003.xht
@@ -213,7 +215,7 @@ border-top-right-radius-009.xht == border-top-right-radius-007.xht
 border-top-right-radius-010.xht == reference/border-radius-001-ref.xht
 border-top-right-radius-011.xht == reference/border-radius-001-ref.xht
 border-top-right-radius-014.xht == reference/border-radius-001-ref.xht
-box-shadow-001.xht == reference/box-shadow-001-ref.xht
+box-shadow-005.xht == reference/box-shadow-005-ref.xht
 box-shadow-inset-spread-without-border-radius.xht == reference/box-shadow-inset-spread-without-border-radius.xht
 box-shadow-inset-without-border-radius.xht == reference/box-shadow-inset-without-border-radius.xht
 box-shadow-outset-spread-without-border-radius.xht == reference/box-shadow-outset-spread-without-border-radius.xht
diff --git a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/toc.xht
index 844eff6d782..44bec7254da 100644
--- a/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-backgrounds-3_dev/xhtml1print/toc.xht
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Backgrounds</a></th>
-      <td>(383 Tests)</td></tr>
+      <td>(385 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
@@ -42,17 +42,17 @@
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
         Rounded Corners</a></th>
-      <td>(108 Tests)</td></tr>
+      <td>(109 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         Border Images</a></th>
-      <td>(33 Tests)</td></tr>
+      <td>(34 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Miscellaneous Effects</a></th>
-      <td>(10 Tests)</td></tr>
+      <td>(11 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/chapter-3.htm
index f34f2f10ddb..f021165853a 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/chapter-3.htm
@@ -3250,7 +3250,7 @@
       <tr id="font-size-adjust-007-3.6" class="primary ahem invalid">
         <td><strong>
             <a href="font-size-adjust-007.htm">font-size-adjust-007</a></strong></td>
-        <td><a href="reference/ref-if-there-is-no-red.htm">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>font-size-adjust - 'auto' value is ignored
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-005.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-005.htm
index b26fb169c10..d8d98f14790 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-005.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-005.htm
@@ -18,7 +18,7 @@
   div#zero-value-test
   {
   color: red;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 0;
   }
   </style>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-006.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-006.htm
index 4cea5594d2f..93f934d2441 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-006.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-006.htm
@@ -17,7 +17,7 @@
   div#test-percent-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 50%;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-007.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-007.htm
index 647529d14a9..1bb7ebb6f43 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-007.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-007.htm
@@ -8,7 +8,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
   <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop" title="3.6 Relative sizing: the font-size-adjust property">
   <link rel="bookmark" href="https://lists.w3.org/Archives/Public/www-style/2015Mar/0282.html" title="[css-fonts] What does font-size-adjust for '0' look like?">
-  <link rel="match" href="reference/ref-if-there-is-no-red.htm">
+  <link rel="match" href="reference/ref-filled-green-100px-square.htm">
 
   <meta content="ahem invalid" name="flags">
   <meta content="This test checks that 'auto' does not apply to font-size-adjust and therefore must be ignored." name="assert">
@@ -17,7 +17,7 @@
   div#test-auto-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: auto;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-008.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-008.htm
index 78bfe73547a..f876fb0195c 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-008.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-size-adjust-008.htm
@@ -17,7 +17,7 @@
   div#test-negative-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: -0.5;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm
new file mode 100644
index 00000000000..12dbd398b98
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style type="text/css">
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <div></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/reftest-toc.htm
index 4d65d56a256..77aabb4c6de 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/reftest-toc.htm
@@ -1012,7 +1012,7 @@
       <tr>
         <td rowspan="1" title="font-size-adjust - 'auto' value is ignored">
           <a href="font-size-adjust-007.htm">font-size-adjust-007</a></td>
-        <td><a href="reference/ref-if-there-is-no-red.htm">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/reftest.list b/tests/wpt/css-tests/css-fonts-3_dev/html/reftest.list
index b4820e8cb84..206468a3119 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/reftest.list
@@ -122,7 +122,7 @@ font-size-122.htm == reference/font-size-122-ref.htm
 font-size-123.htm == reference/font-size-123-ref.htm
 font-size-adjust-005.htm == reference/ref-if-there-is-no-red.htm
 font-size-adjust-006.htm == reference/ref-filled-green-100px-square.htm
-font-size-adjust-007.htm == reference/ref-if-there-is-no-red.htm
+font-size-adjust-007.htm == reference/ref-filled-green-100px-square.htm
 font-size-adjust-008.htm == reference/ref-filled-green-100px-square.htm
 font-size-applies-to-016.htm == reference/no-red-on-blank-page-ref.htm
 font-style-applies-to-001.htm == reference/font-style-applies-to-001-ref.htm
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-fonts-3_dev/implementation-report-TEMPLATE.data
index 94ebf23027d..0714d2d265e 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-fonts-3_dev/implementation-report-TEMPLATE.data
@@ -547,14 +547,14 @@ html/font-size-adjust-002.htm	e23b1613f315bb08db2dd889eea82327952536f6	?
 xhtml1/font-size-adjust-002.xht	e23b1613f315bb08db2dd889eea82327952536f6	?
 html/font-size-adjust-003.htm	76bdd71fdd1aef6fb668dbe98db2fe362e10cdb4	?
 xhtml1/font-size-adjust-003.xht	76bdd71fdd1aef6fb668dbe98db2fe362e10cdb4	?
-html/font-size-adjust-005.htm	c361d896c578739e5e4156b5719e61078bb20f64	?
-xhtml1/font-size-adjust-005.xht	c361d896c578739e5e4156b5719e61078bb20f64	?
-html/font-size-adjust-006.htm	e79aabc31e4259a2e1fc2ab86cc67661dbd62d52	?
-xhtml1/font-size-adjust-006.xht	e79aabc31e4259a2e1fc2ab86cc67661dbd62d52	?
-html/font-size-adjust-007.htm	82940e561311c597d72c9eb0ed4895d782e1db9b	?
-xhtml1/font-size-adjust-007.xht	82940e561311c597d72c9eb0ed4895d782e1db9b	?
-html/font-size-adjust-008.htm	a04f6a4f97ac33c54ef6cf477de640c8cba97693	?
-xhtml1/font-size-adjust-008.xht	a04f6a4f97ac33c54ef6cf477de640c8cba97693	?
+html/font-size-adjust-005.htm	e9cb807e44ec0adf5b74f551e5ff98acd60bb063	?
+xhtml1/font-size-adjust-005.xht	e9cb807e44ec0adf5b74f551e5ff98acd60bb063	?
+html/font-size-adjust-006.htm	1894632878d4019736b3cfcc10f5da924684e83a	?
+xhtml1/font-size-adjust-006.xht	1894632878d4019736b3cfcc10f5da924684e83a	?
+html/font-size-adjust-007.htm	8b16c67ce336bd9896168ed9e52c8ff34248ac26	?
+xhtml1/font-size-adjust-007.xht	8b16c67ce336bd9896168ed9e52c8ff34248ac26	?
+html/font-size-adjust-008.htm	2d06d0aeab15dcf7e0f5ebdaeda1c9c4f6ab8fb6	?
+xhtml1/font-size-adjust-008.xht	2d06d0aeab15dcf7e0f5ebdaeda1c9c4f6ab8fb6	?
 html/font-size-applies-to-001.htm	fbc00023abeebe442c9719bfc2530c367045ad7c	?
 xhtml1/font-size-applies-to-001.xht	fbc00023abeebe442c9719bfc2530c367045ad7c	?
 html/font-size-applies-to-002.htm	8994461fab45e1672a00ecfc2d88ba252286a795	?
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data b/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data
index 8c0e1332c90..000f7ab44d9 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data
@@ -271,10 +271,10 @@ font-size-123	reference/font-size-123-ref	CSS Parsing: Negative Font-Size	invali
 font-size-adjust-001		font-size-adjust - greater than aspect value of font	Ahem	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	46f5fd861c048d4b7623e050749230b0fef45685	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that the actual font size is greater than the specified size when the value of font-size-adjust is greater than the aspect value of font
 font-size-adjust-002		font-size-adjust - less than aspect value of font	Ahem	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	e23b1613f315bb08db2dd889eea82327952536f6	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that the actual font size is less than the specified size when the value of font-size-adjust is less than the aspect value of font
 font-size-adjust-003		font-size-adjust - first available and installed font	font	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	76bdd71fdd1aef6fb668dbe98db2fe362e10cdb4	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	In this test, span.test's first 3 fallback fonts are unavailable and the next fallback fonts have a relatively big aspect value with regards to each fonts listed, declared in span.reference rule (0.450). This test checks that 'font-size-adjust' property adjusts the relative height of lowercase letters of available, installed fallback fonts listed, declared in span.test rule (0.530-0.545) to match the relative height of lowercase letters of fonts listed, declared in span.reference rule (0.450).
-font-size-adjust-005	reference/ref-if-there-is-no-red	font-size-adjust - 0 value implies a 0px used font-size	ahem	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	c361d896c578739e5e4156b5719e61078bb20f64	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a 0 value implies that used font-size must be 0px.
-font-size-adjust-006	reference/ref-filled-green-100px-square	font-size-adjust - a percentage value is invalid	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	e79aabc31e4259a2e1fc2ab86cc67661dbd62d52	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a percentage value is invalid and therefore must be ignored.
-font-size-adjust-007	reference/ref-if-there-is-no-red	font-size-adjust - 'auto' value is ignored	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	82940e561311c597d72c9eb0ed4895d782e1db9b	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'auto' does not apply to font-size-adjust and therefore must be ignored.
-font-size-adjust-008	reference/ref-filled-green-100px-square	font-size-adjust - a negative value is invalid	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	a04f6a4f97ac33c54ef6cf477de640c8cba97693	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a negative value is invalid and therefore must be ignored.
+font-size-adjust-005	reference/ref-if-there-is-no-red	font-size-adjust - 0 value implies a 0px used font-size	ahem	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	e9cb807e44ec0adf5b74f551e5ff98acd60bb063	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a 0 value implies that used font-size must be 0px.
+font-size-adjust-006	reference/ref-filled-green-100px-square	font-size-adjust - a percentage value is invalid	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	1894632878d4019736b3cfcc10f5da924684e83a	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a percentage value is invalid and therefore must be ignored.
+font-size-adjust-007	reference/ref-filled-green-100px-square	font-size-adjust - 'auto' value is ignored	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	8b16c67ce336bd9896168ed9e52c8ff34248ac26	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'auto' does not apply to font-size-adjust and therefore must be ignored.
+font-size-adjust-008	reference/ref-filled-green-100px-square	font-size-adjust - a negative value is invalid	ahem,invalid	http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop	2d06d0aeab15dcf7e0f5ebdaeda1c9c4f6ab8fb6	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that a negative value is invalid and therefore must be ignored.
 font-size-applies-to-001		Font-size and 'display: inline' elements	ahem	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size,http://www.w3.org/TR/CSS21/fonts.html#font-size-props,http://www.w3.org/TR/css-fonts-3/#font-size-prop	fbc00023abeebe442c9719bfc2530c367045ad7c	`Microsoft`<http://www.microsoft.com/>	The 'font-size' property applies to 'display: inline' elements.
 font-size-applies-to-002		Font-size and 'display: block' elements	ahem	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size,http://www.w3.org/TR/CSS21/fonts.html#font-size-props,http://www.w3.org/TR/css-fonts-3/#font-size-prop	8994461fab45e1672a00ecfc2d88ba252286a795	`Microsoft`<http://www.microsoft.com/>	The 'font-size' property applies to 'display: block' elements.
 font-size-applies-to-003		Font-size and 'display: list-item' elements	ahem	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size,http://www.w3.org/TR/CSS21/fonts.html#font-size-props,http://www.w3.org/TR/css-fonts-3/#font-size-prop	7ff24c35c0bc48157db513b72230516e9bf37e86	`Microsoft`<http://www.microsoft.com/>	The 'font-size' property applies to 'display: list-item' elements.
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/chapter-3.xht
index e5c1b139996..92ea42b2c57 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/chapter-3.xht
@@ -3250,7 +3250,7 @@
       <tr id="font-size-adjust-007-3.6" class="primary ahem invalid">
         <td><strong>
             <a href="font-size-adjust-007.xht">font-size-adjust-007</a></strong></td>
-        <td><a href="reference/ref-if-there-is-no-red.xht">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>font-size-adjust - 'auto' value is ignored
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-005.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-005.xht
index 1feb9c58b9b..59fd1b2ff6f 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-005.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-005.xht
@@ -18,7 +18,7 @@
   div#zero-value-test
   {
   color: red;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 0;
   }
   ]]></style>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-006.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-006.xht
index 832a75bb975..52b899da728 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-006.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-006.xht
@@ -17,7 +17,7 @@
   div#test-percent-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 50%;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-007.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-007.xht
index 4996996ed50..ee6530e8bc2 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-007.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-007.xht
@@ -8,7 +8,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop" title="3.6 Relative sizing: the font-size-adjust property" />
   <link rel="bookmark" href="https://lists.w3.org/Archives/Public/www-style/2015Mar/0282.html" title="[css-fonts] What does font-size-adjust for '0' look like?" />
-  <link rel="match" href="reference/ref-if-there-is-no-red.xht" />
+  <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
 
   <meta content="ahem invalid" name="flags" />
   <meta content="This test checks that 'auto' does not apply to font-size-adjust and therefore must be ignored." name="assert" />
@@ -17,7 +17,7 @@
   div#test-auto-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: auto;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-008.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-008.xht
index 3e49a5c6e6a..367a0664bf2 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-008.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-size-adjust-008.xht
@@ -17,7 +17,7 @@
   div#test-negative-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: -0.5;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht
new file mode 100644
index 00000000000..52353556602
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <div></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest-toc.xht
index b7dfb89fa45..3ad34ff9137 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest-toc.xht
@@ -1012,7 +1012,7 @@
       <tr>
         <td rowspan="1" title="font-size-adjust - 'auto' value is ignored">
           <a href="font-size-adjust-007.xht">font-size-adjust-007</a></td>
-        <td><a href="reference/ref-if-there-is-no-red.xht">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest.list
index b83a02127f1..cdbf318c642 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reftest.list
@@ -122,7 +122,7 @@ font-size-122.xht == reference/font-size-122-ref.xht
 font-size-123.xht == reference/font-size-123-ref.xht
 font-size-adjust-005.xht == reference/ref-if-there-is-no-red.xht
 font-size-adjust-006.xht == reference/ref-filled-green-100px-square.xht
-font-size-adjust-007.xht == reference/ref-if-there-is-no-red.xht
+font-size-adjust-007.xht == reference/ref-filled-green-100px-square.xht
 font-size-adjust-008.xht == reference/ref-filled-green-100px-square.xht
 font-size-applies-to-016.xht == reference/no-red-on-blank-page-ref.xht
 font-style-applies-to-001.xht == reference/font-style-applies-to-001-ref.xht
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/chapter-3.xht
index e5c1b139996..92ea42b2c57 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/chapter-3.xht
@@ -3250,7 +3250,7 @@
       <tr id="font-size-adjust-007-3.6" class="primary ahem invalid">
         <td><strong>
             <a href="font-size-adjust-007.xht">font-size-adjust-007</a></strong></td>
-        <td><a href="reference/ref-if-there-is-no-red.xht">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>font-size-adjust - 'auto' value is ignored
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-005.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-005.xht
index 3072da536b0..6546ea50e73 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-005.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-005.xht
@@ -27,7 +27,7 @@
   div#zero-value-test
   {
   color: red;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 0;
   }
   ]]></style>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-006.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-006.xht
index 649c264df1c..d2dd6b818c6 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-006.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-006.xht
@@ -26,7 +26,7 @@
   div#test-percent-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: 50%;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht
index ece6d6b9ea0..e31e86b962c 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht
@@ -17,7 +17,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop" title="3.6 Relative sizing: the font-size-adjust property" />
   <link rel="bookmark" href="https://lists.w3.org/Archives/Public/www-style/2015Mar/0282.html" title="[css-fonts] What does font-size-adjust for '0' look like?" />
-  <link rel="match" href="reference/ref-if-there-is-no-red.xht" />
+  <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
 
   <meta content="ahem invalid" name="flags" />
   <meta content="This test checks that 'auto' does not apply to font-size-adjust and therefore must be ignored." name="assert" />
@@ -26,7 +26,7 @@
   div#test-auto-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: auto;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-008.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-008.xht
index 70305fa9f48..8c5d0cbd3ad 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-008.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-size-adjust-008.xht
@@ -26,7 +26,7 @@
   div#test-negative-value
   {
   color: green;
-  font: 6.25em/1 Ahem; /* computes to 100px/100px */
+  font: 100px/1 Ahem; /* computes to 100px/100px */
   font-size-adjust: -0.5;
   }
 
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht
new file mode 100644
index 00000000000..5d02afdef70
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Fonts Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test ref-filled-green-100px-square"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <div></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest-toc.xht
index b7dfb89fa45..3ad34ff9137 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest-toc.xht
@@ -1012,7 +1012,7 @@
       <tr>
         <td rowspan="1" title="font-size-adjust - 'auto' value is ignored">
           <a href="font-size-adjust-007.xht">font-size-adjust-007</a></td>
-        <td><a href="reference/ref-if-there-is-no-red.xht">=</a> </td>
+        <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest.list
index b83a02127f1..cdbf318c642 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reftest.list
@@ -122,7 +122,7 @@ font-size-122.xht == reference/font-size-122-ref.xht
 font-size-123.xht == reference/font-size-123-ref.xht
 font-size-adjust-005.xht == reference/ref-if-there-is-no-red.xht
 font-size-adjust-006.xht == reference/ref-filled-green-100px-square.xht
-font-size-adjust-007.xht == reference/ref-if-there-is-no-red.xht
+font-size-adjust-007.xht == reference/ref-filled-green-100px-square.xht
 font-size-adjust-008.xht == reference/ref-filled-green-100px-square.xht
 font-size-applies-to-016.xht == reference/no-red-on-blank-page-ref.xht
 font-style-applies-to-001.xht == reference/font-style-applies-to-001-ref.xht
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/chapter-4.htm b/tests/wpt/css-tests/css-style-attr-1_dev/html4/chapter-4.htm
index 815fd1f09b8..4415de73e58 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/html4/chapter-4.htm
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/html4/chapter-4.htm
@@ -59,7 +59,7 @@
       <tr id="style-attr-cascade-004-4" class="">
         <td>
             <a href="style-attr-cascade-004.htm">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -67,7 +67,7 @@
       <tr id="style-attr-cascade-005-4" class="">
         <td>
             <a href="style-attr-cascade-005.htm">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/reference/ref-green-background.htm b/tests/wpt/css-tests/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm
similarity index 100%
rename from tests/wpt/css-tests/css-style-attr-1_dev/html4/reference/ref-green-background.htm
rename to tests/wpt/css-tests/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest-toc.htm b/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest-toc.htm
index f3c4b57b171..c394661159b 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest-toc.htm
@@ -84,7 +84,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.htm">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -92,7 +92,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.htm">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest.list b/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest.list
index 9c4952c6e24..ca3a6a7e169 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/html4/reftest.list
@@ -6,8 +6,8 @@ style-attr-braces-003.htm == reference/ref-green-on-green.htm
 style-attr-cascade-001.htm == reference/ref-green.htm
 style-attr-cascade-002.htm == reference/ref-green.htm
 style-attr-cascade-003.htm == reference/ref-green.htm
-style-attr-cascade-004.htm == reference/ref-green-background.htm
-style-attr-cascade-005.htm == reference/ref-green-background.htm
+style-attr-cascade-004.htm == reference/ref-white-on-green-background.htm
+style-attr-cascade-005.htm == reference/ref-white-on-green-background.htm
 style-attr-cascade-006.htm == reference/ref-green.htm
 style-attr-cascade-007.htm == reference/style-attr-cascade-007.htm
 style-attr-specificity-001.htm == reference/ref-green-on-green.htm
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-004.htm b/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-004.htm
index 4d5ec12df57..c9cdc956720 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-004.htm
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-004.htm
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules">
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret">
-  <link rel="match" href="reference/ref-green-background.htm">
+  <link rel="match" href="reference/ref-white-on-green-background.htm">
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-005.htm b/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-005.htm
index c6b7b49c55a..00655a80c7e 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-005.htm
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/html4/style-attr-cascade-005.htm
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules">
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret">
-  <link rel="match" href="reference/ref-green-background.htm">
+  <link rel="match" href="reference/ref-white-on-green-background.htm">
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-style-attr-1_dev/implementation-report-TEMPLATE.data
index 09b253891d5..458e458a4bb 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/implementation-report-TEMPLATE.data
@@ -17,10 +17,10 @@ html4/style-attr-cascade-002.htm	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	?
 xhtml1/style-attr-cascade-002.xht	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	?
 html4/style-attr-cascade-003.htm	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	?
 xhtml1/style-attr-cascade-003.xht	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	?
-html4/style-attr-cascade-004.htm	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	?
-xhtml1/style-attr-cascade-004.xht	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	?
-html4/style-attr-cascade-005.htm	29da953d3c353f6f18e4dbdae63638d354c73df2	?
-xhtml1/style-attr-cascade-005.xht	29da953d3c353f6f18e4dbdae63638d354c73df2	?
+html4/style-attr-cascade-004.htm	002bed21e9e44e603e6c8431853eb0fd8c636dad	?
+xhtml1/style-attr-cascade-004.xht	002bed21e9e44e603e6c8431853eb0fd8c636dad	?
+html4/style-attr-cascade-005.htm	72e8f4b20c569e6bb4c3634639719332bc70a223	?
+xhtml1/style-attr-cascade-005.xht	72e8f4b20c569e6bb4c3634639719332bc70a223	?
 html4/style-attr-cascade-006.htm	5f31a718bbe6eedd436062d4e68e5878b74aa581	?
 xhtml1/style-attr-cascade-006.xht	5f31a718bbe6eedd436062d4e68e5878b74aa581	?
 html4/style-attr-cascade-007.htm	d59eaebdf15f153ab8c1016e07344df3bed2dbd2	?
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/testinfo.data b/tests/wpt/css-tests/css-style-attr-1_dev/testinfo.data
index ced71913f1a..be51151d479 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/testinfo.data
@@ -6,8 +6,8 @@ style-attr-braces-003	reference/ref-green-on-green	Pairing braces in style attri
 style-attr-cascade-001	reference/ref-green	CSS: style attributes vs. important tag selector		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	9ea5fe841cee012c60f48a36f301ef4554767c4b	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-002	reference/ref-green	CSS: style attribute (normal vs. important)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/css-style-attr/#interpret	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-003	reference/ref-green	CSS: style attribute vs. tag selector		http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	`Ian Hickson`<mailto:ian@hixie.ch>	
-style-attr-cascade-004	reference/ref-green-background	CSS: style attribute vs. important tag selectors		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	`Ian Hickson`<mailto:ian@hixie.ch>	
-style-attr-cascade-005	reference/ref-green-background	CSS: style attribute vs. tag selectors (interleaved importance)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	29da953d3c353f6f18e4dbdae63638d354c73df2	`Ian Hickson`<mailto:ian@hixie.ch>	
+style-attr-cascade-004	reference/ref-white-on-green-background	CSS: style attribute vs. important tag selectors		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	002bed21e9e44e603e6c8431853eb0fd8c636dad	`Ian Hickson`<mailto:ian@hixie.ch>	
+style-attr-cascade-005	reference/ref-white-on-green-background	CSS: style attribute vs. tag selectors (interleaved importance)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	72e8f4b20c569e6bb4c3634639719332bc70a223	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-006	reference/ref-green	CSS: style attribute and 'inherit'		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	5f31a718bbe6eedd436062d4e68e5878b74aa581	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-007	reference/style-attr-cascade-007	Style Attribute Inheritance	image	http://www.w3.org/TR/CSS21/cascade.html#inheritance,http://www.w3.org/TR/css-style-attr/#interpret	d59eaebdf15f153ab8c1016e07344df3bed2dbd2	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Iff a property inherits, it also inherits when declared via style attribute.
 style-attr-specificity-001	reference/ref-green-on-green	Style attribute and specificity of selectors		http://www.w3.org/TR/css-style-attr/#interpret,http://www.w3.org/TR/CSS21/cascade.html#specificity	ff304694f5444dd8bbe043ceb52447cea2ec2cee	`Microsoft`<http://www.microsoft.com/>	The style attribute has a higher specificity than any other selector.
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/chapter-4.xht
index 1b0d8754809..bd4333776fe 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/chapter-4.xht
@@ -59,7 +59,7 @@
       <tr id="style-attr-cascade-004-4" class="">
         <td>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -67,7 +67,7 @@
       <tr id="style-attr-cascade-005-4" class="">
         <td>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht
similarity index 100%
rename from tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht
rename to tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest-toc.xht
index 5d420e4a211..96a5c8ec83a 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest-toc.xht
@@ -84,7 +84,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -92,7 +92,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest.list
index cf7955766fe..ba84c2687cd 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/reftest.list
@@ -6,8 +6,8 @@ style-attr-braces-003.xht == reference/ref-green-on-green.xht
 style-attr-cascade-001.xht == reference/ref-green.xht
 style-attr-cascade-002.xht == reference/ref-green.xht
 style-attr-cascade-003.xht == reference/ref-green.xht
-style-attr-cascade-004.xht == reference/ref-green-background.xht
-style-attr-cascade-005.xht == reference/ref-green-background.xht
+style-attr-cascade-004.xht == reference/ref-white-on-green-background.xht
+style-attr-cascade-005.xht == reference/ref-white-on-green-background.xht
 style-attr-cascade-006.xht == reference/ref-green.xht
 style-attr-cascade-007.xht == reference/style-attr-cascade-007.xht
 style-attr-specificity-001.xht == reference/ref-green-on-green.xht
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht
index 316d0cacc9d..73f3f209a37 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht
index 14093ba88bf..395472ddd82 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/chapter-4.xht
index 1b0d8754809..bd4333776fe 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/chapter-4.xht
@@ -59,7 +59,7 @@
       <tr id="style-attr-cascade-004-4" class="">
         <td>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -67,7 +67,7 @@
       <tr id="style-attr-cascade-005-4" class="">
         <td>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht
similarity index 100%
rename from tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht
rename to tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest-toc.xht
index 5d420e4a211..96a5c8ec83a 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest-toc.xht
@@ -84,7 +84,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -92,7 +92,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest.list
index cf7955766fe..ba84c2687cd 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/reftest.list
@@ -6,8 +6,8 @@ style-attr-braces-003.xht == reference/ref-green-on-green.xht
 style-attr-cascade-001.xht == reference/ref-green.xht
 style-attr-cascade-002.xht == reference/ref-green.xht
 style-attr-cascade-003.xht == reference/ref-green.xht
-style-attr-cascade-004.xht == reference/ref-green-background.xht
-style-attr-cascade-005.xht == reference/ref-green-background.xht
+style-attr-cascade-004.xht == reference/ref-white-on-green-background.xht
+style-attr-cascade-005.xht == reference/ref-white-on-green-background.xht
 style-attr-cascade-006.xht == reference/ref-green.xht
 style-attr-cascade-007.xht == reference/style-attr-cascade-007.xht
 style-attr-specificity-001.xht == reference/ref-green-on-green.xht
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht
index 3e815b51551..736cfb9e35a 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht
@@ -17,7 +17,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht
index 7ece70f9882..22d1420034c 100644
--- a/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht
+++ b/tests/wpt/css-tests/css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht
@@ -17,7 +17,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-3.htm
index 223a2fb6d73..5f42780bef7 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-3.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Emphasis Marks (8 tests)</h2>
+  <h2>Emphasis Marks (9 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -64,7 +64,18 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s3.1.#text-emphasis-style">
-      <!-- 8 tests -->
+      <!-- 9 tests -->
+      <tr id="text-emphasis-style-001-3.1.#text-emphasis-style" class="primary">
+        <td><strong>
+            <a href="text-emphasis-style-001.htm">text-emphasis-style-001</a></strong></td>
+        <td><a href="reference/text-emphasis-style-001-ref.htm">=</a> </td>
+        <td></td>
+        <td>CSS Text Decoration Test - text-emphasis
+          <ul class="assert">
+            <li>Test checks that 'text-emphasis-style: none' shows no emphasis marks.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-emphasis-style-002-3.1.#text-emphasis-style" class="primary">
         <td><strong>
             <a href="text-emphasis-style-002.htm">text-emphasis-style-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm
new file mode 100644
index 00000000000..3a64665fce9
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html><head>
+  <meta charset="utf-8">
+  <title>CSS Reference File</title>
+  <link href="mailto:tak.koroki@gmail.com" rel="author" title="Takanori Koroki">
+  </head>
+  <body>
+    <p>Test passes if there is no dots avobe the text of "Text sample".</p>
+    <p>Text sample</p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest-toc.htm
index 51424541a89..e21d5196ea5 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest-toc.htm
@@ -72,6 +72,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="text-emphasis-style-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS Text Decoration Test - text-emphasis">
+          <a href="text-emphasis-style-001.htm">text-emphasis-style-001</a></td>
+        <td><a href="reference/text-emphasis-style-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="text-emphasis-style-002" class="">
       <tr>
         <td rowspan="1" title="CSS Reference File">
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest.list b/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest.list
index 0ca0f5791bb..4880afb7b89 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/reftest.list
@@ -5,6 +5,7 @@ text-decoration-line-011.htm == reference/text-decoration-line-011-ref.htm
 text-decoration-line-012.htm == reference/text-decoration-line-012-ref.htm
 text-decoration-line-013.htm == reference/text-decoration-line-013-ref.htm
 text-decoration-propagation-01.htm == reference/text-decoration-propagation-01-ref.htm
+text-emphasis-style-001.htm == reference/text-emphasis-style-001-ref.htm
 text-emphasis-style-002.htm == reference/text-emphasis-style-002-ref.htm
 text-emphasis-style-006.htm == reference/text-emphasis-style-006.htm
 text-emphasis-style-007.htm == reference/text-emphasis-style-007.htm
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/text-emphasis-style-001.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/text-emphasis-style-001.htm
new file mode 100644
index 00000000000..15281f4cb2f
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/text-emphasis-style-001.htm
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html><head>
+    <meta charset="utf-8">
+    <title>CSS Text Decoration Test - text-emphasis</title>
+    <link href="mailto:tak.koroki@gmail.com" rel="author" title="Koroki Takanori">
+    <link href="http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style" rel="help" title="3.1. Emphasis Mark Style: the 'text-emphasis-style' property">
+    <link href="reference/text-emphasis-style-001-ref.htm" rel="match">
+    <meta content="Test checks that 'text-emphasis-style: none' shows no emphasis marks." name="assert">
+    <style>
+
+span {
+  /* This style definition will be overwritten by "text-emphasis-style: none;"
+     If the dots appears above the text as emphasis marks, it means "text-emphasis-style: none" is not working. */
+  text-emphasis-style: dot;
+}
+
+#test > .test {
+  text-emphasis-style: none;
+}
+    </style>
+  </head>
+  <body>
+    <p>Test passes if there is no dots above the text of "Text sample".</p>
+    <p id="test">
+      <span class="test">Text</span> <span class="test">sample</span>
+    </p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/toc.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/toc.htm
index ecd0de4d836..01fcb993ede 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/toc.htm
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.htm">Chapter 3 - 
         Emphasis Marks</a></th>
-      <td>(8 Tests)</td></tr>
+      <td>(9 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-text-decor-3_dev/implementation-report-TEMPLATE.data
index 1556828b25d..1473cfe4b56 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/implementation-report-TEMPLATE.data
@@ -17,6 +17,8 @@ html/text-decoration-line-014.htm	5249afc1eca4ab8b4987ea7b1076470ec717eea1	?
 xhtml1/text-decoration-line-014.xht	5249afc1eca4ab8b4987ea7b1076470ec717eea1	?
 html/text-decoration-propagation-01.htm	d2c7ab23fa267a9a336a41c08a4a76dc23b7143b	?
 xhtml1/text-decoration-propagation-01.xht	d2c7ab23fa267a9a336a41c08a4a76dc23b7143b	?
+html/text-emphasis-style-001.htm	d946bdb3fa56a68a5ea37bc2ba497fb8c8295ba7	?
+xhtml1/text-emphasis-style-001.xht	d946bdb3fa56a68a5ea37bc2ba497fb8c8295ba7	?
 html/text-emphasis-style-002.htm	ccf68b60bc2ea97be8961717db3eab04dfea0c6d	?
 xhtml1/text-emphasis-style-002.xht	ccf68b60bc2ea97be8961717db3eab04dfea0c6d	?
 html/text-emphasis-style-006.htm	dbe08f05f6457a27fb5b81200fbe086078314555	?
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/index.htm b/tests/wpt/css-tests/css-text-decor-3_dev/index.htm
index 8ac1360d011..6b226a16835 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/index.htm
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/index.htm
@@ -135,6 +135,7 @@
     <li>Fuyuko Ikeguchi</li>
     <li>G&eacute;rard Talbot</li>
     <li>Kazuaki Takemura</li>
+    <li>Koroki Takanori</li>
     <li>Shinsuke Matsuki</li>
     <li>Taka Oshiyama</li>
     <li>TestTWF Tokyo Meetup (Unofficial)</li>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/index.xht b/tests/wpt/css-tests/css-text-decor-3_dev/index.xht
index 65aba43634f..7c9de1c8f56 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/index.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/index.xht
@@ -135,6 +135,7 @@
     <li>Fuyuko Ikeguchi</li>
     <li>G&eacute;rard Talbot</li>
     <li>Kazuaki Takemura</li>
+    <li>Koroki Takanori</li>
     <li>Shinsuke Matsuki</li>
     <li>Taka Oshiyama</li>
     <li>TestTWF Tokyo Meetup (Unofficial)</li>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/testinfo.data b/tests/wpt/css-tests/css-text-decor-3_dev/testinfo.data
index c096f42c88f..c5a7b141da2 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/testinfo.data
@@ -6,6 +6,7 @@ text-decoration-line-012	reference/text-decoration-line-012-ref	text-decoration-
 text-decoration-line-013	reference/text-decoration-line-013-ref	text-decoration-line - line-through	font	http://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property	941f9aba140d18783aa42e77db1a4504fadb7b52	`Taka Oshiyama`<mailto:takaoshiyama@gmail.com>	This test checks that 'text-decoration-line: line-through' produces an horizontal line through the middle of the text.
 text-decoration-line-014		text-decoration-line - blink	animated,font,may	http://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property	5249afc1eca4ab8b4987ea7b1076470ec717eea1	`Taka Oshiyama`<mailto:takaoshiyama@gmail.com>	This test checks that 'text-decoration-line: blink' blinks (alternates between visible and invisible).
 text-decoration-propagation-01	reference/text-decoration-propagation-01-ref	text-decoration shouldn't propagate through 'svg' element		http://www.w3.org/TR/css-text-decor-3/#line-decoration	d2c7ab23fa267a9a336a41c08a4a76dc23b7143b	`Cameron McCormack`<mailto:cam@mcc.id.au>	An outer 'svg' element is an atomic inline-axis element, so text decorations must not propagate through it.
+text-emphasis-style-001	reference/text-emphasis-style-001-ref	CSS Text Decoration Test - text-emphasis		http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style	d946bdb3fa56a68a5ea37bc2ba497fb8c8295ba7	`Koroki Takanori`<mailto:tak.koroki@gmail.com>	Test checks that 'text-emphasis-style: none' shows no emphasis marks.
 text-emphasis-style-002	reference/text-emphasis-style-002-ref	CSS Reference File		http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style	ccf68b60bc2ea97be8961717db3eab04dfea0c6d	`Yuuki Furukawa`<mailto:tenderhearted0407@gmail.com>	This test checks 'text-emphasis-style: filled dot;'
 text-emphasis-style-006	reference/text-emphasis-style-006	CSS Text Decoration Test - text-emphasis		http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style	dbe08f05f6457a27fb5b81200fbe086078314555	`TestTWF Tokyo Meetup (Unofficial)`<mailto:tomoyuki.labs@gmail.com>	Test checks 'text-emphasis-style: filled dot'
 text-emphasis-style-007	reference/text-emphasis-style-007	CSS Text Decoration Test - text-emphasis		http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style	235004cf641da957e5a9b0ae9cd7767a66378717	`TestTWF Tokyo Meetup (Unofficial)`<mailto:tomoyuki.labs@gmail.com>	Test checks 'text-emphasis-style: filled circle'
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-3.xht
index 48e84125dd6..cab8f848197 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Emphasis Marks (8 tests)</h2>
+  <h2>Emphasis Marks (9 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -64,7 +64,18 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s3.1.#text-emphasis-style">
-      <!-- 8 tests -->
+      <!-- 9 tests -->
+      <tr id="text-emphasis-style-001-3.1.#text-emphasis-style" class="primary">
+        <td><strong>
+            <a href="text-emphasis-style-001.xht">text-emphasis-style-001</a></strong></td>
+        <td><a href="reference/text-emphasis-style-001-ref.xht">=</a> </td>
+        <td></td>
+        <td>CSS Text Decoration Test - text-emphasis
+          <ul class="assert">
+            <li>Test checks that 'text-emphasis-style: none' shows no emphasis marks.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-emphasis-style-002-3.1.#text-emphasis-style" class="primary">
         <td><strong>
             <a href="text-emphasis-style-002.xht">text-emphasis-style-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht
new file mode 100644
index 00000000000..33a2f44c946
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+  <meta charset="utf-8" />
+  <title>CSS Reference File</title>
+  <link href="mailto:tak.koroki@gmail.com" rel="author" title="Takanori Koroki" />
+  </head>
+  <body>
+    <p>Test passes if there is no dots avobe the text of "Text sample".</p>
+    <p>Text sample</p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest-toc.xht
index 6a4b0e50c2f..dd6569e7c5b 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest-toc.xht
@@ -72,6 +72,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="text-emphasis-style-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS Text Decoration Test - text-emphasis">
+          <a href="text-emphasis-style-001.xht">text-emphasis-style-001</a></td>
+        <td><a href="reference/text-emphasis-style-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="text-emphasis-style-002" class="">
       <tr>
         <td rowspan="1" title="CSS Reference File">
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest.list
index 1ca1d634fba..3d2c342e027 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/reftest.list
@@ -5,6 +5,7 @@ text-decoration-line-011.xht == reference/text-decoration-line-011-ref.xht
 text-decoration-line-012.xht == reference/text-decoration-line-012-ref.xht
 text-decoration-line-013.xht == reference/text-decoration-line-013-ref.xht
 text-decoration-propagation-01.xht == reference/text-decoration-propagation-01-ref.xht
+text-emphasis-style-001.xht == reference/text-emphasis-style-001-ref.xht
 text-emphasis-style-002.xht == reference/text-emphasis-style-002-ref.xht
 text-emphasis-style-006.xht == reference/text-emphasis-style-006.xht
 text-emphasis-style-007.xht == reference/text-emphasis-style-007.xht
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht
new file mode 100644
index 00000000000..81fd8bbfa3b
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <meta charset="utf-8" />
+    <title>CSS Text Decoration Test - text-emphasis</title>
+    <link href="mailto:tak.koroki@gmail.com" rel="author" title="Koroki Takanori" />
+    <link href="http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style" rel="help" title="3.1. Emphasis Mark Style: the 'text-emphasis-style' property" />
+    <link href="reference/text-emphasis-style-001-ref.xht" rel="match" />
+    <meta content="Test checks that 'text-emphasis-style: none' shows no emphasis marks." name="assert" />
+    <style>
+
+span {
+  /* This style definition will be overwritten by "text-emphasis-style: none;"
+     If the dots appears above the text as emphasis marks, it means "text-emphasis-style: none" is not working. */
+  text-emphasis-style: dot;
+}
+
+#test &gt; .test {
+  text-emphasis-style: none;
+}
+    </style>
+  </head>
+  <body>
+    <p>Test passes if there is no dots above the text of "Text sample".</p>
+    <p id="test">
+      <span class="test">Text</span> <span class="test">sample</span>
+    </p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/toc.xht
index e92802e43df..d8e70bec71c 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/toc.xht
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Emphasis Marks</a></th>
-      <td>(8 Tests)</td></tr>
+      <td>(9 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-3.xht
index 48e84125dd6..cab8f848197 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Emphasis Marks (8 tests)</h2>
+  <h2>Emphasis Marks (9 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -64,7 +64,18 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s3.1.#text-emphasis-style">
-      <!-- 8 tests -->
+      <!-- 9 tests -->
+      <tr id="text-emphasis-style-001-3.1.#text-emphasis-style" class="primary">
+        <td><strong>
+            <a href="text-emphasis-style-001.xht">text-emphasis-style-001</a></strong></td>
+        <td><a href="reference/text-emphasis-style-001-ref.xht">=</a> </td>
+        <td></td>
+        <td>CSS Text Decoration Test - text-emphasis
+          <ul class="assert">
+            <li>Test checks that 'text-emphasis-style: none' shows no emphasis marks.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-emphasis-style-002-3.1.#text-emphasis-style" class="primary">
         <td><strong>
             <a href="text-emphasis-style-002.xht">text-emphasis-style-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht
new file mode 100644
index 00000000000..33a2f44c946
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+  <meta charset="utf-8" />
+  <title>CSS Reference File</title>
+  <link href="mailto:tak.koroki@gmail.com" rel="author" title="Takanori Koroki" />
+  </head>
+  <body>
+    <p>Test passes if there is no dots avobe the text of "Text sample".</p>
+    <p>Text sample</p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest-toc.xht
index 6a4b0e50c2f..dd6569e7c5b 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest-toc.xht
@@ -72,6 +72,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="text-emphasis-style-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS Text Decoration Test - text-emphasis">
+          <a href="text-emphasis-style-001.xht">text-emphasis-style-001</a></td>
+        <td><a href="reference/text-emphasis-style-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="text-emphasis-style-002" class="">
       <tr>
         <td rowspan="1" title="CSS Reference File">
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest.list
index 1ca1d634fba..3d2c342e027 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/reftest.list
@@ -5,6 +5,7 @@ text-decoration-line-011.xht == reference/text-decoration-line-011-ref.xht
 text-decoration-line-012.xht == reference/text-decoration-line-012-ref.xht
 text-decoration-line-013.xht == reference/text-decoration-line-013-ref.xht
 text-decoration-propagation-01.xht == reference/text-decoration-propagation-01-ref.xht
+text-emphasis-style-001.xht == reference/text-emphasis-style-001-ref.xht
 text-emphasis-style-002.xht == reference/text-emphasis-style-002-ref.xht
 text-emphasis-style-006.xht == reference/text-emphasis-style-006.xht
 text-emphasis-style-007.xht == reference/text-emphasis-style-007.xht
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht
new file mode 100644
index 00000000000..81fd8bbfa3b
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <meta charset="utf-8" />
+    <title>CSS Text Decoration Test - text-emphasis</title>
+    <link href="mailto:tak.koroki@gmail.com" rel="author" title="Koroki Takanori" />
+    <link href="http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style" rel="help" title="3.1. Emphasis Mark Style: the 'text-emphasis-style' property" />
+    <link href="reference/text-emphasis-style-001-ref.xht" rel="match" />
+    <meta content="Test checks that 'text-emphasis-style: none' shows no emphasis marks." name="assert" />
+    <style>
+
+span {
+  /* This style definition will be overwritten by "text-emphasis-style: none;"
+     If the dots appears above the text as emphasis marks, it means "text-emphasis-style: none" is not working. */
+  text-emphasis-style: dot;
+}
+
+#test &gt; .test {
+  text-emphasis-style: none;
+}
+    </style>
+  </head>
+  <body>
+    <p>Test passes if there is no dots above the text of "Text sample".</p>
+    <p id="test">
+      <span class="test">Text</span> <span class="test">sample</span>
+    </p>
+  
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/toc.xht
index e92802e43df..d8e70bec71c 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/toc.xht
@@ -32,7 +32,7 @@
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Emphasis Marks</a></th>
-      <td>(8 Tests)</td></tr>
+      <td>(9 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
index 1ae9aa42d12..646f4d4302b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline Direction and Bidirectionality (164 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (172 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -1102,7 +1102,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#direction">2.1 Specifying Directionality: the direction property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 30 tests -->
       <tr id="direction-001-2.1" class="primary">
         <td><strong>
             <a href="direction-001.htm">direction-001</a></strong></td>
@@ -1345,6 +1345,98 @@
           </ul>
         </td>
       </tr>
+      <tr id="table-progression-001-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-001-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.1.#propdef-direction">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
index 1d075dd77e5..c7270c347c5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text (84 tests)</h2>
+  <h2>Introduction to Vertical Text (90 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -40,7 +40,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode">3.1 Block Flow Direction: the writing-mode property</a></th></tr>
-      <!-- 68 tests -->
+      <!-- 74 tests -->
       <tr id="block-flow-direction-001-3.1" class="primary ahem">
         <td><strong>
             <a href="block-flow-direction-001.htm">block-flow-direction-001</a></strong></td>
@@ -748,22 +748,92 @@
       <tr id="table-progression-001-vlr-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-lr Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
           </ul>
         </td>
       </tr>
       <tr id="table-progression-001-vrl-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-rl Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
index fda251efc08..d00797d9d08 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline-level Alignment (34 tests)</h2>
+  <h2>Inline-level Alignment (31 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -49,7 +49,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.2">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">4.2 Text Baselines</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 8 tests -->
       <tr id="central-baseline-alignment-002-4.2" class="primary ahem">
         <td><strong>
             <a href="central-baseline-alignment-002.htm">central-baseline-alignment-002</a></strong></td>
@@ -130,7 +130,7 @@
       <tr id="text-baseline-007-4.2" class="primary ahem">
         <td><strong>
             <a href="text-baseline-007.htm">text-baseline-007</a></strong></td>
-        <td><a href="reference/text-baseline-007-ref.htm">=</a> </td>
+        <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text baseline alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -138,28 +138,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="text-baseline-008-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-008.htm">text-baseline-008</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="text-baseline-009-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-009.htm">text-baseline-009</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s4.2.#alphabetic-baseline">
       <!-- 0 tests -->
@@ -171,7 +149,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">4.3 Atomic Inline Baselines</a></th></tr>
-      <!-- 24 tests -->
+      <!-- 23 tests -->
       <tr id="baseline-inline-non-replaced-002-4.3" class="primary ahem">
         <td><strong>
             <a href="baseline-inline-non-replaced-002.htm">baseline-inline-non-replaced-002</a></strong></td>
@@ -296,7 +274,7 @@
       <tr id="inline-block-alignment-007-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></strong></td>
-        <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -315,17 +293,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-4.3" class="primary ahem">
-        <td><strong>
-            <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></strong></td>
-        <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inline-block-alignment-orthogonal-vlr-003-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-orthogonal-vlr-003.htm">inline-block-alignment-orthogonal-vlr-003</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
index 9d5d0150122..22f7e8c78b9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text Layout (25 tests)</h2>
+  <h2>Introduction to Vertical Text Layout (29 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -55,7 +55,51 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation">5.1 Orienting Text: the text-orientation property</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 29 tests -->
+      <tr id="table-progression-003-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-orientation-010-5.1" class="primary ahem font">
         <td><strong>
             <a href="text-orientation-010.htm">text-orientation-010</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
index f45eb1b0795..9e5074b06b3 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
@@ -3,16 +3,15 @@
   <head>
     <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
-    <link rel="match" href="reference/inline-block-alignment-007-ref.htm">
+    <link rel="match" href="reference/inline-block-alignment-006-ref.htm">
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -50,7 +49,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm
deleted file mode 100644
index cffdcdc9069..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
-    <link rel="match" href="reference/inline-block-alignment-009-ref.htm">
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem">
-    <style type="text/css">
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
index b1b6b2c2560..30f48d3d5a5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
index 973d908a8c8..21c5ca0a086 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
index 19c9b26196d..8118a02f544 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
index 79bb6b009be..437c57765c1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
index 27e7a08945d..e807b9c0646 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
@@ -35,7 +35,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
index ab525cca860..dd630b02430 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
@@ -35,7 +35,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm
deleted file mode 100644
index dc08df26fba..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-  <meta name="flags" content="image">
-  <style type="text/css">
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled">
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm
deleted file mode 100644
index 9594ecd1e81..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-  <meta name="flags" content="image">
-  <style type="text/css">
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled">
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm
deleted file mode 100644
index 4994d5558e0..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<html><head><title>CSS Reference</title>
-<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-
-<style>
-  table {
-    border-spacing: 0;
-    margin: 1em;
-  }
-  td {
-    width: 1em;
-    height: 1em;
-    border: solid gray;
-  }
-
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
-  caption { background: green; }
-</style>
-
-</head><body><p>Test passes if the following three tables look identical.
-
-</p><table>
-  <caption></caption>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm
deleted file mode 100644
index b42b57f39b7..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-01-29 -->
-  <meta name="flags" content="image">
-  <style type="text/css">
-
-  img
-  {
-    padding-left: 78px;
-    vertical-align: top;
-  }
-
-  img + br + img
-  {
-    padding-left: 30px;
-  }
-
-  img + br + img + br + img
-  {
-    padding-left: 102px;
-  }
-    </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div><img src="support/swatch-fuchsia.png" width="48" height="60" alt="Image download support must be enabled"><br><img src="support/swatch-fuchsia.png" width="96" height="120" alt="Image download support must be enabled"><br><img src="support/swatch-fuchsia.png" width="24" height="30" alt="Image download support must be enabled"></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
index be0eed3f423..0bcdea00fab 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
@@ -12,7 +12,7 @@
   <style type="text/css">
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
index 74c0a031e75..b256c60a80d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
@@ -12,7 +12,7 @@
   <style type="text/css">
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
index 99b941a6293..797c2b9e541 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
@@ -17,7 +17,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
index 7280ce0e6f9..1ed2c0fffbc 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
@@ -17,7 +17,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
index 9d7d14e3e4c..79145f6ec3d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
@@ -4428,7 +4428,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -4440,14 +4440,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-alignment-orthogonal-vlr-003" class="ahem">
       <tr>
         <td rowspan="1" title="text baseline alignment of inline-block in orthogonal flow">
@@ -5068,7 +5060,7 @@
       <tr>
         <td rowspan="1" title="vertical-lr Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></td>
-        <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5076,7 +5068,55 @@
       <tr>
         <td rowspan="1" title="vertical-rl Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></td>
-        <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5268,22 +5308,6 @@
       <tr>
         <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
           <a href="text-baseline-007.htm">text-baseline-007</a></td>
-        <td><a href="reference/text-baseline-007-ref.htm">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-008" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-008.htm">text-baseline-008</a></td>
-        <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-009.htm">text-baseline-009</a></td>
         <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
index 43e15319ad1..b1c829a3227 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
@@ -549,9 +549,8 @@ inline-block-alignment-003.htm == reference/inline-block-alignment-003-ref.htm
 inline-block-alignment-004.htm == reference/inline-block-alignment-002-ref.htm
 inline-block-alignment-005.htm == reference/inline-block-alignment-003-ref.htm
 inline-block-alignment-006.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-007.htm == reference/inline-block-alignment-007-ref.htm
+inline-block-alignment-007.htm == reference/inline-block-alignment-006-ref.htm
 inline-block-alignment-008.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-009.htm == reference/inline-block-alignment-009-ref.htm
 inline-block-alignment-orthogonal-vlr-003.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
 inline-block-alignment-orthogonal-vlr-005.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
 inline-block-alignment-orthogonal-vrl-002.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
@@ -629,8 +628,14 @@ table-column-order-002.htm == reference/block-flow-direction-001-ref.htm
 table-column-order-003.htm == reference/block-flow-direction-001-ref.htm
 table-column-order-004.htm == reference/block-flow-direction-001-ref.htm
 table-column-order-005.htm == reference/block-flow-direction-001-ref.htm
-table-progression-001-vlr.htm == reference/table-progression-001-ref.htm
-table-progression-001-vrl.htm == reference/table-progression-001-ref.htm
+table-progression-001-vlr.htm == table-progression-001-ref.orngtml
+table-progression-001-vrl.htm == table-progression-001-ref.orngtml
+table-progression-002-vlr.htm == table-progression-002-ref.orngtml
+table-progression-002-vrl.htm == table-progression-002-ref.orngtml
+table-progression-003-vlr.htm == table-progression-001-ref.orngtml
+table-progression-003-vrl.htm == table-progression-001-ref.orngtml
+table-progression-004-vlr.htm == table-progression-002-ref.orngtml
+table-progression-004-vrl.htm == table-progression-002-ref.orngtml
 text-align-vlr-003.htm == reference/ref-filled-green-100px-square.htm
 text-align-vlr-005.htm == reference/ref-filled-green-100px-square.htm
 text-align-vlr-007.htm == reference/ref-filled-green-100px-square.htm
@@ -654,9 +659,7 @@ text-baseline-003.htm == reference/text-baseline-002-ref.htm
 text-baseline-004.htm == reference/text-baseline-002-ref.htm
 text-baseline-005.htm == reference/text-baseline-002-ref.htm
 text-baseline-006.htm == reference/text-baseline-006-ref.htm
-text-baseline-007.htm == reference/text-baseline-007-ref.htm
-text-baseline-008.htm == reference/text-baseline-006-ref.htm
-text-baseline-009.htm == reference/text-baseline-006-ref.htm
+text-baseline-007.htm == reference/text-baseline-006-ref.htm
 text-combine-upright-decorations-001.htm == reference/text-combine-upright-decorations-001.htm
 text-combine-upright-inherit-all-001.htm == reference/text-combine-upright-inherit-all-001.htm
 text-combine-upright-inherit-all-002.htm == reference/text-combine-upright-inherit-all-002.htm
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
index d79b08674c8..286634c4298 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
@@ -1,14 +1,19 @@
 <!DOCTYPE html>
 <html><head><title>CSS Test: vertical-lr Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-<link href="reference/table-progression-001-ref.htm" rel="match">
+<link href="table-progression-001-ref.orngtml" rel="match">
 <meta content="This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert">
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
 
 <style>
   .test {
     writing-mode: vertical-lr;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,33 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,54 +59,54 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
   </td></tr></tbody><tbody>
     <tr>
       <td rowspan="3">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
       <td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
 </td></tr></tbody></table>
 
 <table class="test" dir="rtl">
   <thead>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></thead><tfoot>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></tfoot><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="2" rowspan="2">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td rowspan="3">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
 </td></tr></tbody></table>
 
@@ -90,22 +114,23 @@
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
+    </td><td class="orng">
     </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="navy">
+
   </td></tr><tr>
     <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
+    </td><td class="yllw">
+    </td><td class="pink">
     </td><td rowspan="2">
-    </td><td class="b">
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
index d63847f1725..5436493a59b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
@@ -1,14 +1,19 @@
 <!DOCTYPE html>
 <html><head><title>CSS Test: vertical-rl Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-<link href="reference/table-progression-001-ref.htm" rel="match">
+<link href="table-progression-001-ref.orngtml" rel="match">
 <meta content="This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert">
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
 
 <style>
   .test {
     writing-mode: vertical-rl;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,32 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,27 +58,27 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></thead><tfoot>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></tfoot><tbody>
     <tr>
       <td rowspan="3">
       </td><td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
 </td></tr></tbody></table>
 
@@ -63,48 +86,48 @@
   <thead>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
       </td><td rowspan="3">
     </td></tr><tr>
       <td colspan="2" rowspan="2">
-      </td><td class="f">
+      </td><td class="pink">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
 </td></tr></tbody></table>
 
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
   </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm
new file mode 100644
index 00000000000..eae0564cefa
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua">
+  <col class="blue">
+  <col span="2" class="navy">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="navy">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm
new file mode 100644
index 00000000000..fb17937b16e
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua">
+  <col class="blue">
+  <col span="2" class="navy">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="navy">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm
new file mode 100644
index 00000000000..420efd0e0c3
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-001-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm
new file mode 100644
index 00000000000..91a04dc6b02
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-001-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm
new file mode 100644
index 00000000000..938c9df8290
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm
new file mode 100644
index 00000000000..b0883cda34c
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy">
+  <col class="blue">
+  <col span="2" class="aqua">
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue">
+    <col span="2" class="aqua">
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
index e04abe62648..7cb111ae647 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
@@ -3,9 +3,8 @@
   <head>
     <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
     <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
-    <link rel="match" href="reference/text-baseline-007-ref.htm">
+    <link rel="match" href="reference/text-baseline-006-ref.htm">
     <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.">
     <meta name="flags" content="ahem">
     <style type="text/css">
@@ -33,7 +32,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm
deleted file mode 100644
index 0c605903d6a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
-    <link rel="match" href="reference/text-baseline-006-ref.htm">
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem">
-    <style type="text/css">
-    div#rl-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-rl;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="rl-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm
deleted file mode 100644
index 6f5f46ff824..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
-    <link rel="match" href="reference/text-baseline-006-ref.htm">
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem">
-    <style type="text/css">
-    div#lr-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
index 3c7231cbda9..2991cb80d12 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
index fead1289e5d..ac46822c9dc 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
index 877bf002f1d..489ca0c15cd 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
index 76d668ca11b..0f5c087f262 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
index 00d141d5d36..6d91e8e9b24 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
index 6fae8001592..0f2fa4c50b1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
index a5a456c00c4..16855c1b659 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
index 48f88cd6d2e..20857115be5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
index b66deb50efb..f37f01d68bf 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
@@ -17,7 +17,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
index ba88300a6d9..83c2fdb27e8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
index d7e4303ca38..d57edbe5de6 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
index a1b2fcd3dbd..3ac8dad7d54 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
index c8676fe7fd2..11ef9df3127 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
index 9e850ebcf9e..d3ed8e89443 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
index 916c4e74f5f..bbe8ba32c46 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
index cf4f9607146..94c848fb11b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
index 08deeae9066..f123bd894c4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
index 2aafcd859c2..de6fdbc81f5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
index fc18532e24f..0c1b1d382c4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
index 9062d9da066..b94b7693089 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
@@ -27,22 +27,22 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.htm">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(164 Tests)</td></tr>
+      <td>(172 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.htm">Chapter 3 - 
         Introduction to Vertical Text</a></th>
-      <td>(84 Tests)</td></tr>
+      <td>(90 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(34 Tests)</td></tr>
+      <td>(31 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.htm">Chapter 5 - 
         Introduction to Vertical Text Layout</a></th>
-      <td>(25 Tests)</td></tr>
+      <td>(29 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.htm">Chapter 6 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-writing-modes-3_dev/implementation-report-TEMPLATE.data
index 1f543e96679..05ab193999b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/implementation-report-TEMPLATE.data
@@ -1165,20 +1165,18 @@ html/inline-block-alignment-005.htm	f22e9acf9997492e59bf06af71f147cf3a7ef60b	?
 xhtml1/inline-block-alignment-005.xht	f22e9acf9997492e59bf06af71f147cf3a7ef60b	?
 html/inline-block-alignment-006.htm	d331ddb7afc3bbe931b343cfec50b6f142a10f55	?
 xhtml1/inline-block-alignment-006.xht	d331ddb7afc3bbe931b343cfec50b6f142a10f55	?
-html/inline-block-alignment-007.htm	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	?
-xhtml1/inline-block-alignment-007.xht	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	?
+html/inline-block-alignment-007.htm	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	?
+xhtml1/inline-block-alignment-007.xht	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	?
 html/inline-block-alignment-008.htm	0c74b7bbf813193c08885b3d85823e5a2b4fb435	?
 xhtml1/inline-block-alignment-008.xht	0c74b7bbf813193c08885b3d85823e5a2b4fb435	?
-html/inline-block-alignment-009.htm	011236f198ba8944faf000a6768995116784c55f	?
-xhtml1/inline-block-alignment-009.xht	011236f198ba8944faf000a6768995116784c55f	?
-html/inline-block-alignment-orthogonal-vlr-003.htm	4c158c1913bcf69e7f6f7cf7fe1058dea9632639	?
-xhtml1/inline-block-alignment-orthogonal-vlr-003.xht	4c158c1913bcf69e7f6f7cf7fe1058dea9632639	?
-html/inline-block-alignment-orthogonal-vlr-005.htm	9cc37b55e5fc41ccb0ff4eed7d415459861f3b75	?
-xhtml1/inline-block-alignment-orthogonal-vlr-005.xht	9cc37b55e5fc41ccb0ff4eed7d415459861f3b75	?
-html/inline-block-alignment-orthogonal-vrl-002.htm	c87e0c587a27e594349a00542bedeb24af244680	?
-xhtml1/inline-block-alignment-orthogonal-vrl-002.xht	c87e0c587a27e594349a00542bedeb24af244680	?
-html/inline-block-alignment-orthogonal-vrl-004.htm	163cdbb62a145a13609e33b17b53c60c86d2b60d	?
-xhtml1/inline-block-alignment-orthogonal-vrl-004.xht	163cdbb62a145a13609e33b17b53c60c86d2b60d	?
+html/inline-block-alignment-orthogonal-vlr-003.htm	b6891512aa507f9050101d960cf349889329fda3	?
+xhtml1/inline-block-alignment-orthogonal-vlr-003.xht	b6891512aa507f9050101d960cf349889329fda3	?
+html/inline-block-alignment-orthogonal-vlr-005.htm	843d64f690c7eb68c0dd96bdca4cbec3484b13c5	?
+xhtml1/inline-block-alignment-orthogonal-vlr-005.xht	843d64f690c7eb68c0dd96bdca4cbec3484b13c5	?
+html/inline-block-alignment-orthogonal-vrl-002.htm	26492fc7f467f3d050af3de705b263f7ab7996eb	?
+xhtml1/inline-block-alignment-orthogonal-vrl-002.xht	26492fc7f467f3d050af3de705b263f7ab7996eb	?
+html/inline-block-alignment-orthogonal-vrl-004.htm	b76cd7a87f94be29964bef761b5a28f1108b9994	?
+xhtml1/inline-block-alignment-orthogonal-vrl-004.xht	b76cd7a87f94be29964bef761b5a28f1108b9994	?
 html/inline-replaced-vlr-003.htm	fb490b42fc0b5e2d19122a5ec93d729280d0de37	?
 xhtml1/inline-replaced-vlr-003.xht	fb490b42fc0b5e2d19122a5ec93d729280d0de37	?
 html/inline-replaced-vlr-005.htm	ca2f67096b0544b3e0d80c075acd0db763cbf815	?
@@ -1273,10 +1271,10 @@ html/margin-collapse-vrl-034.htm	c383d4e25e05263bed13bdbe491783e431e8d427	?
 xhtml1/margin-collapse-vrl-034.xht	c383d4e25e05263bed13bdbe491783e431e8d427	?
 html/margin-collapse-vrl-036.htm	646e80149a20561f3e11b75ccf98e5742f55c826	?
 xhtml1/margin-collapse-vrl-036.xht	646e80149a20561f3e11b75ccf98e5742f55c826	?
-html/margin-vlr-003.htm	02f132c12e24ed234c7d79910b270cc64ab6972c	?
-xhtml1/margin-vlr-003.xht	02f132c12e24ed234c7d79910b270cc64ab6972c	?
-html/margin-vrl-002.htm	3750fe541b8a60cceb015ad4592fa7a6d11754ac	?
-xhtml1/margin-vrl-002.xht	3750fe541b8a60cceb015ad4592fa7a6d11754ac	?
+html/margin-vlr-003.htm	efb8e8b39035a1c320622f446a5d8799d59d953e	?
+xhtml1/margin-vlr-003.xht	efb8e8b39035a1c320622f446a5d8799d59d953e	?
+html/margin-vrl-002.htm	0e013e2395651788e72964961d8955431a18c0f0	?
+xhtml1/margin-vrl-002.xht	0e013e2395651788e72964961d8955431a18c0f0	?
 html/orthogonal-parent-shrink-to-fit-001.htm	aec1eaa173fc3feb10eff6ecd8994fee2b0c52ee	?
 xhtml1/orthogonal-parent-shrink-to-fit-001.xht	aec1eaa173fc3feb10eff6ecd8994fee2b0c52ee	?
 html/orthogonal-parent-shrink-to-fit-001a.htm	3a18cea77e5f3eddab45aa912eddb27cb5237487	?
@@ -1387,10 +1385,22 @@ html/table-column-order-004.htm	d6e85e267481db8e23e8e2c7dd3a3e7ae11703e6	?
 xhtml1/table-column-order-004.xht	d6e85e267481db8e23e8e2c7dd3a3e7ae11703e6	?
 html/table-column-order-005.htm	5c5f4e626e4aaeae7387fe8e37beb1be49196e3c	?
 xhtml1/table-column-order-005.xht	5c5f4e626e4aaeae7387fe8e37beb1be49196e3c	?
-html/table-progression-001-vlr.htm	81ab3c7b3c535df5d338adb80f5546732a00193b	?
-xhtml1/table-progression-001-vlr.xht	81ab3c7b3c535df5d338adb80f5546732a00193b	?
-html/table-progression-001-vrl.htm	06d42915fb12d69f3da16d371365f68ba731edb7	?
-xhtml1/table-progression-001-vrl.xht	06d42915fb12d69f3da16d371365f68ba731edb7	?
+html/table-progression-001-vlr.htm	3d990116dcd4f61ef7a083f182336a148522c6f6	?
+xhtml1/table-progression-001-vlr.xht	3d990116dcd4f61ef7a083f182336a148522c6f6	?
+html/table-progression-001-vrl.htm	a2cfa3ea3f4587ab1f29bf6e64d86451c5ee540c	?
+xhtml1/table-progression-001-vrl.xht	a2cfa3ea3f4587ab1f29bf6e64d86451c5ee540c	?
+html/table-progression-002-vlr.htm	fd3e508ce84a5da3ab44d2007a9b8cd35c30f056	?
+xhtml1/table-progression-002-vlr.xht	fd3e508ce84a5da3ab44d2007a9b8cd35c30f056	?
+html/table-progression-002-vrl.htm	7617584bc390068d0d6d40a69a0690bef997290f	?
+xhtml1/table-progression-002-vrl.xht	7617584bc390068d0d6d40a69a0690bef997290f	?
+html/table-progression-003-vlr.htm	b882c0e0cc176c9f707b2e1c1aaabb1309c56e21	?
+xhtml1/table-progression-003-vlr.xht	b882c0e0cc176c9f707b2e1c1aaabb1309c56e21	?
+html/table-progression-003-vrl.htm	376077cdb936c0b77681cee567127052996942a3	?
+xhtml1/table-progression-003-vrl.xht	376077cdb936c0b77681cee567127052996942a3	?
+html/table-progression-004-vlr.htm	7107f58463da705ffa82973649489e4dd99f9b8d	?
+xhtml1/table-progression-004-vlr.xht	7107f58463da705ffa82973649489e4dd99f9b8d	?
+html/table-progression-004-vrl.htm	7bfe32d85901c7f8679b5d1897fdfa8d8071b410	?
+xhtml1/table-progression-004-vrl.xht	7bfe32d85901c7f8679b5d1897fdfa8d8071b410	?
 html/text-align-vlr-003.htm	0bee51c71e26719152960da53a881fbe5aa11d7d	?
 xhtml1/text-align-vlr-003.xht	0bee51c71e26719152960da53a881fbe5aa11d7d	?
 html/text-align-vlr-005.htm	5575d1e1f921175cbaaaed50c5f29339751478bb	?
@@ -1437,12 +1447,8 @@ html/text-baseline-005.htm	d447b06a2b6068a416b6df35e5cb0e365948b695	?
 xhtml1/text-baseline-005.xht	d447b06a2b6068a416b6df35e5cb0e365948b695	?
 html/text-baseline-006.htm	c1ca241edb6288a98305d1aacd16c3e4edbda986	?
 xhtml1/text-baseline-006.xht	c1ca241edb6288a98305d1aacd16c3e4edbda986	?
-html/text-baseline-007.htm	4bf61c853dd7cff00591b669c7616cee91204a1a	?
-xhtml1/text-baseline-007.xht	4bf61c853dd7cff00591b669c7616cee91204a1a	?
-html/text-baseline-008.htm	8a1ebc872ef48cd8554efe1477f2944bd78c0f5a	?
-xhtml1/text-baseline-008.xht	8a1ebc872ef48cd8554efe1477f2944bd78c0f5a	?
-html/text-baseline-009.htm	2851777e1a8ab9c874cc008f2d03bff4487276eb	?
-xhtml1/text-baseline-009.xht	2851777e1a8ab9c874cc008f2d03bff4487276eb	?
+html/text-baseline-007.htm	888e1405950e351c9e24b5015629cbfb899cdbd5	?
+xhtml1/text-baseline-007.xht	888e1405950e351c9e24b5015629cbfb899cdbd5	?
 html/text-combine-upright-decorations-001.htm	280af6570701711000e9512d0fa55c267724d9ae	?
 xhtml1/text-combine-upright-decorations-001.xht	280af6570701711000e9512d0fa55c267724d9ae	?
 html/text-combine-upright-inherit-all-001.htm	71bf076146439091e171f37da2984ca1dcdca01e	?
@@ -1513,38 +1519,38 @@ html/text-decoration-upright-vrl-004.htm	da674a9887fe6ae0fe4e307fad07f43c749a003
 xhtml1/text-decoration-upright-vrl-004.xht	da674a9887fe6ae0fe4e307fad07f43c749a0030	?
 html/text-decoration-upright-vrl-006.htm	d4d19ae10677a788623f605f05a3415c76d6fe31	?
 xhtml1/text-decoration-upright-vrl-006.xht	d4d19ae10677a788623f605f05a3415c76d6fe31	?
-html/text-indent-vlr-003.htm	a2307c05f77001c45994aae0d5030b062140ae79	?
-xhtml1/text-indent-vlr-003.xht	a2307c05f77001c45994aae0d5030b062140ae79	?
-html/text-indent-vlr-005.htm	ec355150dc09150e95645f5b0f45e553e17f97eb	?
-xhtml1/text-indent-vlr-005.xht	ec355150dc09150e95645f5b0f45e553e17f97eb	?
-html/text-indent-vlr-007.htm	62375901a4a5040530d3c029a600d0884de495c2	?
-xhtml1/text-indent-vlr-007.xht	62375901a4a5040530d3c029a600d0884de495c2	?
-html/text-indent-vlr-009.htm	827c577323e54c523892209ba8c45046d1e9a5f6	?
-xhtml1/text-indent-vlr-009.xht	827c577323e54c523892209ba8c45046d1e9a5f6	?
-html/text-indent-vlr-011.htm	b6fa62151069756e1efb9e7c5955cde99df94563	?
-xhtml1/text-indent-vlr-011.xht	b6fa62151069756e1efb9e7c5955cde99df94563	?
-html/text-indent-vlr-013.htm	1e6fa9e1477d00930b79d11534c6a029cf64ab19	?
-xhtml1/text-indent-vlr-013.xht	1e6fa9e1477d00930b79d11534c6a029cf64ab19	?
-html/text-indent-vlr-015.htm	e14477194313b80b51da3315309d03ee82cc2642	?
-xhtml1/text-indent-vlr-015.xht	e14477194313b80b51da3315309d03ee82cc2642	?
-html/text-indent-vlr-017.htm	00c2c20242f09671f96e21129eefb5561a73b723	?
-xhtml1/text-indent-vlr-017.xht	00c2c20242f09671f96e21129eefb5561a73b723	?
-html/text-indent-vrl-002.htm	4276779f3524fd8bc693fb7e47c8900d7ca0f431	?
-xhtml1/text-indent-vrl-002.xht	4276779f3524fd8bc693fb7e47c8900d7ca0f431	?
-html/text-indent-vrl-004.htm	92d4df59d2ea3403f7521d41a82de1f495961590	?
-xhtml1/text-indent-vrl-004.xht	92d4df59d2ea3403f7521d41a82de1f495961590	?
-html/text-indent-vrl-006.htm	667210e580eec69b30ac7d70bb4e852b0bf190a9	?
-xhtml1/text-indent-vrl-006.xht	667210e580eec69b30ac7d70bb4e852b0bf190a9	?
-html/text-indent-vrl-008.htm	a242554acd3084f828d6a271d553e0b3cb00ce73	?
-xhtml1/text-indent-vrl-008.xht	a242554acd3084f828d6a271d553e0b3cb00ce73	?
-html/text-indent-vrl-010.htm	fd43520a39150392ce406569c31ece4b6e2bf692	?
-xhtml1/text-indent-vrl-010.xht	fd43520a39150392ce406569c31ece4b6e2bf692	?
-html/text-indent-vrl-012.htm	0daa6170d48fe9d587ed7fd62850c44967a37628	?
-xhtml1/text-indent-vrl-012.xht	0daa6170d48fe9d587ed7fd62850c44967a37628	?
-html/text-indent-vrl-014.htm	6685678a849e9c2177028da5890defe33b76e75d	?
-xhtml1/text-indent-vrl-014.xht	6685678a849e9c2177028da5890defe33b76e75d	?
-html/text-indent-vrl-016.htm	67f948b37e2a012095cf7c19125a413ac458fcae	?
-xhtml1/text-indent-vrl-016.xht	67f948b37e2a012095cf7c19125a413ac458fcae	?
+html/text-indent-vlr-003.htm	4a0f025789b43b7c66eb02b597ffe68d3713df9c	?
+xhtml1/text-indent-vlr-003.xht	4a0f025789b43b7c66eb02b597ffe68d3713df9c	?
+html/text-indent-vlr-005.htm	613cce7558d142c8087b16a93f692980d25d1299	?
+xhtml1/text-indent-vlr-005.xht	613cce7558d142c8087b16a93f692980d25d1299	?
+html/text-indent-vlr-007.htm	0f8bb761cb195ea9d5a97a04803b5dc5dd6fbd87	?
+xhtml1/text-indent-vlr-007.xht	0f8bb761cb195ea9d5a97a04803b5dc5dd6fbd87	?
+html/text-indent-vlr-009.htm	367500c0bf4ce143b310e71e826e2a5c8fd08205	?
+xhtml1/text-indent-vlr-009.xht	367500c0bf4ce143b310e71e826e2a5c8fd08205	?
+html/text-indent-vlr-011.htm	5390c757956b6fbdbeb98cbe096b070a9194e6e8	?
+xhtml1/text-indent-vlr-011.xht	5390c757956b6fbdbeb98cbe096b070a9194e6e8	?
+html/text-indent-vlr-013.htm	f69873973a5e0c34c0cb2fcedade8c28f62af7d3	?
+xhtml1/text-indent-vlr-013.xht	f69873973a5e0c34c0cb2fcedade8c28f62af7d3	?
+html/text-indent-vlr-015.htm	1f3127e92ceee7e9ea32e96ca2a9cbcdf0ed7303	?
+xhtml1/text-indent-vlr-015.xht	1f3127e92ceee7e9ea32e96ca2a9cbcdf0ed7303	?
+html/text-indent-vlr-017.htm	fc1e9f340f218c76dcaaf2532f9e774cb07c99c6	?
+xhtml1/text-indent-vlr-017.xht	fc1e9f340f218c76dcaaf2532f9e774cb07c99c6	?
+html/text-indent-vrl-002.htm	043281febcf3a68ed282664a68f2f5f51da72e06	?
+xhtml1/text-indent-vrl-002.xht	043281febcf3a68ed282664a68f2f5f51da72e06	?
+html/text-indent-vrl-004.htm	80532ae2a688e79c171a1b53727deacd56b010cf	?
+xhtml1/text-indent-vrl-004.xht	80532ae2a688e79c171a1b53727deacd56b010cf	?
+html/text-indent-vrl-006.htm	a530cfc805a488dba3adebb1c78776910d545f1d	?
+xhtml1/text-indent-vrl-006.xht	a530cfc805a488dba3adebb1c78776910d545f1d	?
+html/text-indent-vrl-008.htm	c4babd490f138a7619e29bbff6de6c328fa2ba42	?
+xhtml1/text-indent-vrl-008.xht	c4babd490f138a7619e29bbff6de6c328fa2ba42	?
+html/text-indent-vrl-010.htm	8d46bec82f7cc1b958533df0447e34fc65f400cf	?
+xhtml1/text-indent-vrl-010.xht	8d46bec82f7cc1b958533df0447e34fc65f400cf	?
+html/text-indent-vrl-012.htm	985e22d2200b9cb6f1622d55d78cf5c5d505f38d	?
+xhtml1/text-indent-vrl-012.xht	985e22d2200b9cb6f1622d55d78cf5c5d505f38d	?
+html/text-indent-vrl-014.htm	237aa7256b471375ef0b81e8764aa74bc69dbf94	?
+xhtml1/text-indent-vrl-014.xht	237aa7256b471375ef0b81e8764aa74bc69dbf94	?
+html/text-indent-vrl-016.htm	bd36efb6824d9649c071507677cdc5d1320798c9	?
+xhtml1/text-indent-vrl-016.xht	bd36efb6824d9649c071507677cdc5d1320798c9	?
 html/text-orientation-010.htm	4ecdbceff7397331c490f98d284800bf1fa125a2	?
 xhtml1/text-orientation-010.xht	4ecdbceff7397331c490f98d284800bf1fa125a2	?
 html/text-orientation-011.htm	1e2a7d34e5dbf3ae8ebe3191281f4ed36965d6a5	?
@@ -1589,12 +1595,12 @@ html/text-orientation-script-001n.htm	75668b8433dbbb2bc2e62fd4bf2445560c858453	?
 xhtml1/text-orientation-script-001n.xht	75668b8433dbbb2bc2e62fd4bf2445560c858453	?
 html/text-orientation-script-001o.htm	ad390d60dd518de633056d1bd59900406d4d23e8	?
 xhtml1/text-orientation-script-001o.xht	ad390d60dd518de633056d1bd59900406d4d23e8	?
-html/text-orientation-sideways-001.htm	f411981d28666fb0c45c6c70f33b971daf9eb882	?
-xhtml1/text-orientation-sideways-001.xht	f411981d28666fb0c45c6c70f33b971daf9eb882	?
-html/text-orientation-sideways-right-001.htm	0553269d79d31412d44b0b586a2711298ed43b7f	?
-xhtml1/text-orientation-sideways-right-001.xht	0553269d79d31412d44b0b586a2711298ed43b7f	?
-html/text-orientation-upright-001.htm	c2881506193c25b132f0d88c5ad2a8d1c53e37b6	?
-xhtml1/text-orientation-upright-001.xht	c2881506193c25b132f0d88c5ad2a8d1c53e37b6	?
+html/text-orientation-sideways-001.htm	0e563a3b93880c751ed081529a4200309bbd2af2	?
+xhtml1/text-orientation-sideways-001.xht	0e563a3b93880c751ed081529a4200309bbd2af2	?
+html/text-orientation-sideways-right-001.htm	d9d0c11c8add7eaeca3c4895c0b41f1b64808d68	?
+xhtml1/text-orientation-sideways-right-001.xht	d9d0c11c8add7eaeca3c4895c0b41f1b64808d68	?
+html/text-orientation-upright-001.htm	1d7c80ad3f6eb357a1dd9ef0261dba63dcf971a1	?
+xhtml1/text-orientation-upright-001.xht	1d7c80ad3f6eb357a1dd9ef0261dba63dcf971a1	?
 html/underline-font-size-vlr-003.htm	2ed0dce303004a098525b1c0aa2008df639643ea	?
 xhtml1/underline-font-size-vlr-003.xht	2ed0dce303004a098525b1c0aa2008df639643ea	?
 html/underline-font-size-vlr-005.htm	8218f172828fc358d5814147c09eac80646d5167	?
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/testinfo.data b/tests/wpt/css-tests/css-writing-modes-3_dev/testinfo.data
index 29c68683a2b..cf95b5dd086 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/testinfo.data
@@ -580,13 +580,12 @@ inline-block-alignment-003	reference/inline-block-alignment-003-ref	inline-block
 inline-block-alignment-004	reference/inline-block-alignment-002-ref	inline-block alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	f254f9b4e72bd5cfdff0411c9ed832c0d7c437ef	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 inline-block-alignment-005	reference/inline-block-alignment-003-ref	inline-block alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	f22e9acf9997492e59bf06af71f147cf3a7ef60b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 inline-block-alignment-006	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	d331ddb7afc3bbe931b343cfec50b6f142a10f55	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
-inline-block-alignment-007	reference/inline-block-alignment-007-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
+inline-block-alignment-007	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
 inline-block-alignment-008	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	0c74b7bbf813193c08885b3d85823e5a2b4fb435	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
-inline-block-alignment-009	reference/inline-block-alignment-009-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	011236f198ba8944faf000a6768995116784c55f	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
-inline-block-alignment-orthogonal-vlr-003	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	4c158c1913bcf69e7f6f7cf7fe1058dea9632639	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
-inline-block-alignment-orthogonal-vlr-005	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	9cc37b55e5fc41ccb0ff4eed7d415459861f3b75	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
-inline-block-alignment-orthogonal-vrl-002	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	c87e0c587a27e594349a00542bedeb24af244680	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
-inline-block-alignment-orthogonal-vrl-004	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	163cdbb62a145a13609e33b17b53c60c86d2b60d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
+inline-block-alignment-orthogonal-vlr-003	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	b6891512aa507f9050101d960cf349889329fda3	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
+inline-block-alignment-orthogonal-vlr-005	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	843d64f690c7eb68c0dd96bdca4cbec3484b13c5	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
+inline-block-alignment-orthogonal-vrl-002	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	26492fc7f467f3d050af3de705b263f7ab7996eb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
+inline-block-alignment-orthogonal-vrl-004	reference/inline-block-alignment-orthogonal-vrl-002-ref	text baseline alignment of inline-block in orthogonal flow	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	b76cd7a87f94be29964bef761b5a28f1108b9994	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' of the containing block of an inline-block in orthogonal flow is 'horizontal-tb', then the dominant baseline used is the alphabetical baseline. In this test, the inline-block should be 'sitting' on the alphabetical baseline, therefore creating a straight and unbroken bottom edge.
 inline-replaced-vlr-003	reference/inline-replaced-vrl-002-ref	inline replaced element and 'vertical-lr'	image	http://www.w3.org/TR/css-writing-modes-3/#writing-mode	fb490b42fc0b5e2d19122a5ec93d729280d0de37	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that the content of an inline replaced element does not rotate due to the writing mode.
 inline-replaced-vlr-005	reference/inline-replaced-vrl-004-ref	inline replaced element and 'vertical-lr' (advanced)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines	ca2f67096b0544b3e0d80c075acd0db763cbf815	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that, while the content of inline replaced elements do not rotate in vertical writing mode, they are nevertheless laid out from top to bottom (inline base direction) in a line box and their baseline-alignment is central (not alphabetic) and then the following lines boxes (line box direction within a block container) are ordered from left to right.
 inline-replaced-vrl-002	reference/inline-replaced-vrl-002-ref	inline replaced element and 'vertical-rl'	image	http://www.w3.org/TR/css-writing-modes-3/#writing-mode	65edb60ad7a542cacaee25d586d2a07bc30e86b9	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that the content of an inline replaced element does not rotate due to the writing mode.
@@ -634,8 +633,8 @@ margin-collapse-vrl-024	reference/ref-filled-green-100px-square	'vertical-rl' an
 margin-collapse-vrl-030	reference/ref-filled-green-100px-square	'vertical-rl' and margin collapsing - collapse through sibling	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	f7361122bcbe1aa63c13644dc3267d191e7a2b8f	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that horizontal margins of boxes can collapse through a sibling box whose left and right margins collapse in 'vertical-rl' writing-mode.
 margin-collapse-vrl-034	reference/ref-filled-green-100px-square	'vertical-rl' and margin collapsing - right margin of a block collapses with right margin of its first child	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	c383d4e25e05263bed13bdbe491783e431e8d427	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that, in a vertical-rl context, the right margin an in-flow block box collapses with its first in-flow block-level child's right margin if the element has no top border, no top padding, and the child has no clearance.
 margin-collapse-vrl-036	reference/ref-filled-green-100px-square	'vertical-rl' and margin collapsing - left margin of a block collapses with left margin of its last child	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	646e80149a20561f3e11b75ccf98e5742f55c826	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that, in a vertical-rl context, the left margin an in-flow block box collapses with its last in-flow block-level child's left margin if the element has no left padding and no left border and the child's left margin does not collapse with a right margin that has clearance.
-margin-vlr-003	reference/margin-vrl-002-ref	margin in 'vertical-lr' writing-mode context	image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	02f132c12e24ed234c7d79910b270cc64ab6972c	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that margin-left, margin-right, margin-top and margin-bottom do not change in vertical writing-mode. The margin-left property of a box still affects the lefthand margin of such box.
-margin-vrl-002	reference/margin-vrl-002-ref	margin in 'vertical-rl' writing-mode context	image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	3750fe541b8a60cceb015ad4592fa7a6d11754ac	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that margin-left, margin-right, margin-top and margin-bottom do not change in vertical writing-mode. The margin-left property of a box still affects the lefthand margin of such box.
+margin-vlr-003	reference/margin-vrl-002-ref	margin in 'vertical-lr' writing-mode context	image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	efb8e8b39035a1c320622f446a5d8799d59d953e	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that margin-left, margin-right, margin-top and margin-bottom do not change in vertical writing-mode. The margin-left property of a box still affects the lefthand margin of such box.
+margin-vrl-002	reference/margin-vrl-002-ref	margin in 'vertical-rl' writing-mode context	image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	0e013e2395651788e72964961d8955431a18c0f0	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that margin-left, margin-right, margin-top and margin-bottom do not change in vertical writing-mode. The margin-left property of a box still affects the lefthand margin of such box.
 orthogonal-parent-shrink-to-fit-001		Shrink-to-fit with orthogonal children	ahem,combo,script	http://www.w3.org/TR/css-writing-modes-3/#orthogonal-flows	aec1eaa173fc3feb10eff6ecd8994fee2b0c52ee	`Koji Ishii`<mailto:kojiishi@gmail.com>	Shrink-to-fit with orthogonal children
 orthogonal-parent-shrink-to-fit-001a		Shrink-to-fit inline-block with a child of orthogonal block	ahem,script	http://www.w3.org/TR/css-writing-modes-3/#orthogonal-flows	3a18cea77e5f3eddab45aa912eddb27cb5237487	`Koji Ishii`<mailto:kojiishi@gmail.com>	Shrink-to-fit inline-block with a child of orthogonal block
 orthogonal-parent-shrink-to-fit-001b		Shrink-to-fit inline-block with a child of orthogonal inline	ahem,script	http://www.w3.org/TR/css-writing-modes-3/#orthogonal-flows	546a221d6757a318512ac185c51c0ec6c4bf9df1	`Koji Ishii`<mailto:kojiishi@gmail.com>	Shrink-to-fit inline-block with a child of orthogonal inline
@@ -691,8 +690,14 @@ table-column-order-002	reference/block-flow-direction-001-ref	'direction: rtl' -
 table-column-order-003	reference/block-flow-direction-001-ref	'direction: rtl' - table columns order and vertical-lr	ahem	http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	e82ae71ac3541cfba3978ffe9d32d20b1ffcd13d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks that a table with 'writing-mode' set to 'vertical-lr' and with 'direction' set to 'rtl' will have its column displayed from bottom (1st column) to top (last column). The inline base direction is still from top to bottom.
 table-column-order-004	reference/block-flow-direction-001-ref	'direction: rtl' - table columns order and vertical-rl	ahem	http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	d6e85e267481db8e23e8e2c7dd3a3e7ae11703e6	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks that colspanned cells in a table with 'direction' set to 'rtl' are handled according to a bottom-to-top column direction.
 table-column-order-005	reference/block-flow-direction-001-ref	'direction: rtl' - table columns order and vertical-lr	ahem	http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	5c5f4e626e4aaeae7387fe8e37beb1be49196e3c	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks that colspanned cells in a table with 'direction' set to 'rtl' are handled according to a bottom-to-top column direction.
-table-progression-001-vlr	reference/table-progression-001-ref	vertical-lr Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode	81ab3c7b3c535df5d338adb80f5546732a00193b	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.
-table-progression-001-vrl	reference/table-progression-001-ref	vertical-rl Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode	06d42915fb12d69f3da16d371365f68ba731edb7	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.
+table-progression-001-vlr	table-progression-001-ref.orngtml	vertical-lr Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction	3d990116dcd4f61ef7a083f182336a148522c6f6	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'. This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.
+table-progression-001-vrl	table-progression-001-ref.orngtml	vertical-rl Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction	a2cfa3ea3f4587ab1f29bf6e64d86451c5ee540c	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'. This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.
+table-progression-002-vlr	table-progression-002-ref.orngtml	vertical-lr Table Column/Colgroup Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction	fd3e508ce84a5da3ab44d2007a9b8cd35c30f056	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.
+table-progression-002-vrl	table-progression-002-ref.orngtml	vertical-rl Table Column/Colgroup Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction	7617584bc390068d0d6d40a69a0690bef997290f	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.
+table-progression-003-vlr	table-progression-001-ref.orngtml	vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#text-orientation	b882c0e0cc176c9f707b2e1c1aaabb1309c56e21	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.
+table-progression-003-vrl	table-progression-001-ref.orngtml	vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#text-orientation	376077cdb936c0b77681cee567127052996942a3	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.
+table-progression-004-vlr	table-progression-002-ref.orngtml	vertical-lr upright orientation Table Column/Colgroup Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#text-orientation	7107f58463da705ffa82973649489e4dd99f9b8d	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.
+table-progression-004-vrl	table-progression-002-ref.orngtml	vertical-rl upright orientation Table Column/Colgroup Ordering		http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#text-orientation	7bfe32d85901c7f8679b5d1897fdfa8d8071b410	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.
 text-align-vlr-003	reference/ref-filled-green-100px-square	'text-align: left' - 'vertical-lr' and 'direction: ltr'	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	0bee51c71e26719152960da53a881fbe5aa11d7d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	
 text-align-vlr-005	reference/ref-filled-green-100px-square	'text-align: left' - 'vertical-lr' and 'direction: rtl'	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	5575d1e1f921175cbaaaed50c5f29339751478bb	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-align: left' aligns an inline box within a line box with respect to the line box's logical left side (line-left side). Here, 'direction: rtl' has no impact, no influence on such alignment.
 text-align-vlr-007	reference/ref-filled-green-100px-square	'text-align: left' - 'vertical-lr' and initial, default 'direction'	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#vertical-layout	79e2c585512ba21d7f31e4c4d2efc30abb3279b3	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	
@@ -716,9 +721,7 @@ text-baseline-003	reference/text-baseline-002-ref	text baseline alignment - cent
 text-baseline-004	reference/text-baseline-002-ref	text baseline alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	be0d1d66d857686701293217905e62ea9857f9c2	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 text-baseline-005	reference/text-baseline-002-ref	text baseline alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	d447b06a2b6068a416b6df35e5cb0e365948b695	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 text-baseline-006	reference/text-baseline-006-ref	text baseline alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	c1ca241edb6288a98305d1aacd16c3e4edbda986	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
-text-baseline-007	reference/text-baseline-007-ref	text baseline alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	4bf61c853dd7cff00591b669c7616cee91204a1a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
-text-baseline-008	reference/text-baseline-006-ref	text baseline alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	8a1ebc872ef48cd8554efe1477f2944bd78c0f5a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
-text-baseline-009	reference/text-baseline-006-ref	text baseline alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	2851777e1a8ab9c874cc008f2d03bff4487276eb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
+text-baseline-007	reference/text-baseline-006-ref	text baseline alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-baselines	888e1405950e351c9e24b5015629cbfb899cdbd5	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
 text-combine-upright-decorations-001	reference/text-combine-upright-decorations-001	The resulting composition is treated as a signel glyph for decorations	ahem	https://drafts.csswg.org/css-writing-modes-3/#text-combine-layout	280af6570701711000e9512d0fa55c267724d9ae	`Koji Ishii`<mailto:kojiishi@gmail.com>	The resulting composition is treated as a signel glyph for decorations
 text-combine-upright-inherit-all-001	reference/text-combine-upright-inherit-all-001	text-combine-upright:all inherits		http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright	71bf076146439091e171f37da2984ca1dcdca01e	`Koji Ishii`<mailto:kojiishi@gmail.com>	This test checks text-combine-upright:all inherits
 text-combine-upright-inherit-all-002	reference/text-combine-upright-inherit-all-002	text-combine-upright :all		http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright	5f16f6cf05f96410a9698653f5557ca74ae561af	`Shinsuke Matsuki`<mailto:shinsuke.matsuki@access-company.com>,`Koji Ishii`<mailto:kojiishi@gmail.com>	This test checks text-combine-upright:all inherits through the containment hierarchy and interrupted (by a box boundary) text runs
@@ -754,22 +757,22 @@ text-decoration-upright-vlr-007		'text-decoration: line-through' and 'text-orien
 text-decoration-upright-vrl-002		'text-decoration: underline' and 'text-orientation: upright' in a 'vertical-rl' writing-mode		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-writing-modes-3/#logical-to-physical	2b82f16adac5e936f32837c12d77b69da11f1caf	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-decoration: underline' generates a line on the lefthand side of text when 'text-orientation' is set to 'upright' in a 'vertical-rl' writing-mode.
 text-decoration-upright-vrl-004		'text-decoration: overline' and 'text-orientation: upright' in a 'vertical-rl' writing-mode		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-writing-modes-3/#logical-to-physical	da674a9887fe6ae0fe4e307fad07f43c749a0030	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-decoration: overline' generates a line on the righthand side of text when 'text-orientation' is set to 'upright' in a 'vertical-rl' writing-mode.
 text-decoration-upright-vrl-006		'text-decoration: line-through' and 'text-orientation: upright' in a 'vertical-rl' writing-mode		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-writing-modes-3/#logical-to-physical	d4d19ae10677a788623f605f05a3415c76d6fe31	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-decoration: line-through' generates a line that passes through the middle of glyphs when 'text-orientation' is set to 'upright' in a 'vertical-rl' writing-mode.
-text-indent-vlr-003	reference/text-indent-vlr-003-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	a2307c05f77001c45994aae0d5030b062140ae79	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-lr' starts at top toward the bottom and progress toward the bottom.
-text-indent-vlr-005	reference/text-indent-vlr-005-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	ec355150dc09150e95645f5b0f45e553e17f97eb	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
-text-indent-vlr-007	reference/text-indent-vlr-003-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	62375901a4a5040530d3c029a600d0884de495c2	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
-text-indent-vlr-009	reference/text-indent-vlr-005-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	827c577323e54c523892209ba8c45046d1e9a5f6	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
-text-indent-vlr-011	reference/text-indent-vlr-011-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	b6fa62151069756e1efb9e7c5955cde99df94563	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-lr' starts at top toward the bottom and progress toward the bottom.
-text-indent-vlr-013	reference/text-indent-vlr-013-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	1e6fa9e1477d00930b79d11534c6a029cf64ab19	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
-text-indent-vlr-015	reference/text-indent-vlr-011-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	e14477194313b80b51da3315309d03ee82cc2642	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
-text-indent-vlr-017	reference/text-indent-vlr-013-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	00c2c20242f09671f96e21129eefb5561a73b723	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
-text-indent-vrl-002	reference/text-indent-vrl-002-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	4276779f3524fd8bc693fb7e47c8900d7ca0f431	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-rl' starts at top toward the bottom and progress toward the bottom.
-text-indent-vrl-004	reference/text-indent-vrl-004-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	92d4df59d2ea3403f7521d41a82de1f495961590	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
-text-indent-vrl-006	reference/abs-pos-non-replaced-vlr-009-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	667210e580eec69b30ac7d70bb4e852b0bf190a9	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
-text-indent-vrl-008	reference/text-indent-vrl-008-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	a242554acd3084f828d6a271d553e0b3cb00ce73	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
-text-indent-vrl-010	reference/text-indent-vrl-010-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	fd43520a39150392ce406569c31ece4b6e2bf692	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-rl' starts at top toward the bottom and progress toward the bottom.
-text-indent-vrl-012	reference/text-indent-vrl-012-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	0daa6170d48fe9d587ed7fd62850c44967a37628	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
-text-indent-vrl-014	reference/text-indent-vrl-010-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	6685678a849e9c2177028da5890defe33b76e75d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
-text-indent-vrl-016	reference/text-indent-vrl-012-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	67f948b37e2a012095cf7c19125a413ac458fcae	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
+text-indent-vlr-003	reference/text-indent-vlr-003-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	4a0f025789b43b7c66eb02b597ffe68d3713df9c	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-lr' starts at top toward the bottom and progress toward the bottom.
+text-indent-vlr-005	reference/text-indent-vlr-005-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	613cce7558d142c8087b16a93f692980d25d1299	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
+text-indent-vlr-007	reference/text-indent-vlr-003-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	0f8bb761cb195ea9d5a97a04803b5dc5dd6fbd87	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
+text-indent-vlr-009	reference/text-indent-vlr-005-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-lr' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	367500c0bf4ce143b310e71e826e2a5c8fd08205	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
+text-indent-vlr-011	reference/text-indent-vlr-011-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	5390c757956b6fbdbeb98cbe096b070a9194e6e8	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-lr' starts at top toward the bottom and progress toward the bottom.
+text-indent-vlr-013	reference/text-indent-vlr-013-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	f69873973a5e0c34c0cb2fcedade8c28f62af7d3	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
+text-indent-vlr-015	reference/text-indent-vlr-011-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	1f3127e92ceee7e9ea32e96ca2a9cbcdf0ed7303	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
+text-indent-vlr-017	reference/text-indent-vlr-013-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-lr' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	fc1e9f340f218c76dcaaf2532f9e774cb07c99c6	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-lr' starts at bottom toward the top and progress toward the top.
+text-indent-vrl-002	reference/text-indent-vrl-002-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	043281febcf3a68ed282664a68f2f5f51da72e06	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-rl' starts at top toward the bottom and progress toward the bottom.
+text-indent-vrl-004	reference/text-indent-vrl-004-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	80532ae2a688e79c171a1b53727deacd56b010cf	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
+text-indent-vrl-006	reference/abs-pos-non-replaced-vlr-009-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	a530cfc805a488dba3adebb1c78776910d545f1d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
+text-indent-vrl-008	reference/text-indent-vrl-008-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-rl' writing-mode (orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	c4babd490f138a7619e29bbff6de6c328fa2ba42	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
+text-indent-vrl-010	reference/text-indent-vrl-010-ref	'text-indent' with absolute unit, 'direction: ltr' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	8d46bec82f7cc1b958533df0447e34fc65f400cf	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: ltr' and with 'writing-mode: vertical-rl' starts at top toward the bottom and progress toward the bottom.
+text-indent-vrl-012	reference/text-indent-vrl-012-ref	'text-indent' with absolute unit, 'direction: rtl' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	985e22d2200b9cb6f1622d55d78cf5c5d505f38d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
+text-indent-vrl-014	reference/text-indent-vrl-010-ref	'text-indent' with percentage unit, 'direction: ltr' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	237aa7256b471375ef0b81e8764aa74bc69dbf94	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height.
+text-indent-vrl-016	reference/text-indent-vrl-012-ref	'text-indent' with percentage unit, 'direction: rtl' in 'vertical-rl' writing-mode (non-orthogonal)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout	bd36efb6824d9649c071507677cdc5d1320798c9	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that 'text-indent' set with a percentage unit will be a percentage of the containing block height. 'text-indent' will indent the first line of text at line-start. Text of a line box in 'direction: rtl' and with 'writing-mode: vertical-rl' starts at bottom toward the top and progress toward the top.
 text-orientation-010		text-orientation - mixed	ahem,font	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	4ecdbceff7397331c490f98d284800bf1fa125a2	`Taka Oshiyama`<mailto:takaoshiyama@gmail.com>	This test checks that 'text-orientation: mixed' causes characters from horizontal-only scripts are set sideways, i.e. 90&deg;clockwise from their standard orientation in horizontal text. Characters from vertical scripts are set with their intrinsic orientation. This is effective to verify 1.block flow direction, 2.inline direction and 3.glyph orientation.
 text-orientation-011		text-orientation - upright	ahem,font	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	1e2a7d34e5dbf3ae8ebe3191281f4ed36965d6a5	`Taka Oshiyama`<mailto:takaoshiyama@gmail.com>	This test checks that 'text-orientation: upright' causes characters from horizontal-only scripts are rendered upright, i.e. in their standard horizontal orientation, in vertical writing modes. This is effective to verify 1.block flow direction, 2.inline direction and 3.glyph orientation.
 text-orientation-012	reference/text-orientation-012-ref	text-orientation - sideways-right	ahem	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	8438a0a844a186f9404cb0652f4449db4423ebfc	`Taka Oshiyama`<mailto:takaoshiyama@gmail.com>	This test checks that 'text-orientation: sideways-right' causes text to be set as if in a horizontal layout, but rotated 90&deg; clockwise, in vertical writing modes. This is effective to verify 1.block flow direction, 2.inline direction and 3.glyph orientation.
@@ -792,9 +795,9 @@ text-orientation-script-001l		Test orientation of characters where vo=U (#4/5, 2
 text-orientation-script-001m		Test orientation of characters where vo=U (#5/5, 787 code points in U+1F6BB-2FA1D).	dom,font,script	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	24dd6e5df9229834b0b3e78ff48bcfa205c400e1	`Koji Ishii`<mailto:kojiishi@gmail.com>	Test orientation of characters where vo=U (#5/5, 787 code points in U+1F6BB-2FA1D)
 text-orientation-script-001n		Test orientation of characters where vo=Tr (47 code points in U+2329-FFE3).	dom,font,script	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	75668b8433dbbb2bc2e62fd4bf2445560c858453	`Koji Ishii`<mailto:kojiishi@gmail.com>	Test orientation of characters where vo=Tr (47 code points in U+2329-FFE3)
 text-orientation-script-001o		Test orientation of characters where vo=Tu (147 code points in U+3001-1F201).	dom,font,script	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	ad390d60dd518de633056d1bd59900406d4d23e8	`Koji Ishii`<mailto:kojiishi@gmail.com>	Test orientation of characters where vo=Tu (147 code points in U+3001-1F201)
-text-orientation-sideways-001		text-orientation - sideways in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	f411981d28666fb0c45c6c70f33b971daf9eb882	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that the same as [text-orientation: sideways-right], general horizontal text(include Japanese,etc) rotates 90 degrees clockwise, and it is verified whether the characters are aligned in the vertical direction.
-text-orientation-sideways-right-001		text-orientation - sideways-right in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	0553269d79d31412d44b0b586a2711298ed43b7f	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that general horizontal text(include Japanese,etc) rotates 90 degrees clockwise, and it is verified whether the characters are aligned in the vertical direction.
-text-orientation-upright-001		text-orientation - upright in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	c2881506193c25b132f0d88c5ad2a8d1c53e37b6	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that the alphabet is displayed on the upright (not sideways),and it is verified whether the characters are aligned in the vertical direction including vertical writing characters(Japanese, Mongolian, Hangul, etc).
+text-orientation-sideways-001		text-orientation - sideways in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	0e563a3b93880c751ed081529a4200309bbd2af2	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that the same as [text-orientation: sideways-right], general horizontal text(include Japanese,etc) rotates 90 degrees clockwise, and it is verified whether the characters are aligned in the vertical direction.
+text-orientation-sideways-right-001		text-orientation - sideways-right in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	d9d0c11c8add7eaeca3c4895c0b41f1b64808d68	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that general horizontal text(include Japanese,etc) rotates 90 degrees clockwise, and it is verified whether the characters are aligned in the vertical direction.
+text-orientation-upright-001		text-orientation - upright in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	1d7c80ad3f6eb357a1dd9ef0261dba63dcf971a1	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that the alphabet is displayed on the upright (not sideways),and it is verified whether the characters are aligned in the vertical direction including vertical writing characters(Japanese, Mongolian, Hangul, etc).
 underline-font-size-vlr-003		'text-decoration: underline' with various font sizes		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	2ed0dce303004a098525b1c0aa2008df639643ea	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when mongolian glyphs of varying font sizes are used in mixed text-orientation (therefore with text centrally baseline-aligned), then the text-decoration of the parent box is used across the parent box.
 underline-font-size-vlr-005		'text-decoration: underline' with various font sizes and mixed text		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	8218f172828fc358d5814147c09eac80646d5167	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and mongolian glyphs of varying font sizes are used in mixed text-orientation (therefore with text centrally baseline-aligned), then the text-decoration of the parent box is used across the parent box.
 underline-font-size-vrl-002		'text-decoration: underline' with various font sizes		http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	9d177e35a9389b54beaadb42c09d951c9257f137	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when east-asian glyphs of varying font sizes are used in mixed text-orientation (therefore with text centrally baseline-aligned), then the text-decoration of the parent box is used across the parent box.
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht
index 064a2f7e5d9..cf853a1987d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline Direction and Bidirectionality (164 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (172 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1102,7 +1102,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#direction">2.1 Specifying Directionality: the direction property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 30 tests -->
       <tr id="direction-001-2.1" class="primary">
         <td><strong>
             <a href="direction-001.xht">direction-001</a></strong></td>
@@ -1345,6 +1345,98 @@
           </ul>
         </td>
       </tr>
+      <tr id="table-progression-001-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-001-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.1.#propdef-direction">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht
index b0db598fed4..2c67433470d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text (84 tests)</h2>
+  <h2>Introduction to Vertical Text (90 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -40,7 +40,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode">3.1 Block Flow Direction: the writing-mode property</a></th></tr>
-      <!-- 68 tests -->
+      <!-- 74 tests -->
       <tr id="block-flow-direction-001-3.1" class="primary ahem">
         <td><strong>
             <a href="block-flow-direction-001.xht">block-flow-direction-001</a></strong></td>
@@ -748,22 +748,92 @@
       <tr id="table-progression-001-vlr-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-lr Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
           </ul>
         </td>
       </tr>
       <tr id="table-progression-001-vrl-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-rl Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht
index e51dd69afff..ab467fc9288 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline-level Alignment (34 tests)</h2>
+  <h2>Inline-level Alignment (31 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -49,7 +49,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.2">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">4.2 Text Baselines</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 8 tests -->
       <tr id="central-baseline-alignment-002-4.2" class="primary ahem">
         <td><strong>
             <a href="central-baseline-alignment-002.xht">central-baseline-alignment-002</a></strong></td>
@@ -130,7 +130,7 @@
       <tr id="text-baseline-007-4.2" class="primary ahem">
         <td><strong>
             <a href="text-baseline-007.xht">text-baseline-007</a></strong></td>
-        <td><a href="reference/text-baseline-007-ref.xht">=</a> </td>
+        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text baseline alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -138,28 +138,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="text-baseline-008-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-008.xht">text-baseline-008</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="text-baseline-009-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-009.xht">text-baseline-009</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s4.2.#alphabetic-baseline">
       <!-- 0 tests -->
@@ -171,7 +149,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">4.3 Atomic Inline Baselines</a></th></tr>
-      <!-- 24 tests -->
+      <!-- 23 tests -->
       <tr id="baseline-inline-non-replaced-002-4.3" class="primary ahem">
         <td><strong>
             <a href="baseline-inline-non-replaced-002.xht">baseline-inline-non-replaced-002</a></strong></td>
@@ -296,7 +274,7 @@
       <tr id="inline-block-alignment-007-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></strong></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -315,17 +293,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-4.3" class="primary ahem">
-        <td><strong>
-            <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></strong></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inline-block-alignment-orthogonal-vlr-003-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-orthogonal-vlr-003.xht">inline-block-alignment-orthogonal-vlr-003</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht
index f30bd707b69..a6512290c2c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text Layout (25 tests)</h2>
+  <h2>Introduction to Vertical Text Layout (29 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -55,7 +55,51 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation">5.1 Orienting Text: the text-orientation property</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 29 tests -->
+      <tr id="table-progression-003-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-orientation-010-5.1" class="primary ahem font">
         <td><strong>
             <a href="text-orientation-010.xht">text-orientation-010</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht
index c62a3102cab..f84a27c247d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht
@@ -3,16 +3,15 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-007-ref.xht" />
+    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -50,7 +49,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht
deleted file mode 100644
index 415bf31786c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-009-ref.xht" />
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht
index 38088a3543f..2c346b178d2 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht
index 745a4be1c3b..0d673b1fb09 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht
index 0663aca1ebb..03eb2bdbb9b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht
index 666dffec360..1232fd52bac 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht
@@ -13,7 +13,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht
index 997ea486236..3ba1f8a4f71 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht
@@ -35,7 +35,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht
index 6dcf446f87d..c58b71cb1a4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht
@@ -35,7 +35,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
deleted file mode 100644
index af276765500..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
deleted file mode 100644
index 750090cd261..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht
deleted file mode 100644
index 527b6273f7b..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reference</title>
-<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-
-<style>
-  table {
-    border-spacing: 0;
-    margin: 1em;
-  }
-  td {
-    width: 1em;
-    height: 1em;
-    border: solid gray;
-  }
-
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
-  caption { background: green; }
-</style>
-
-</head><body><p>Test passes if the following three tables look identical.
-
-</p><table>
-  <caption></caption>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht
deleted file mode 100644
index 833aa250594..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-01-29 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-
-  img
-  {
-    padding-left: 78px;
-    vertical-align: top;
-  }
-
-  img + br + img
-  {
-    padding-left: 30px;
-  }
-
-  img + br + img + br + img
-  {
-    padding-left: 102px;
-  }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div><img src="support/swatch-fuchsia.png" width="48" height="60" alt="Image download support must be enabled" /><br /><img src="support/swatch-fuchsia.png" width="96" height="120" alt="Image download support must be enabled" /><br /><img src="support/swatch-fuchsia.png" width="24" height="30" alt="Image download support must be enabled" /></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht
index 1eb0b8af894..8dcfcd37393 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht
@@ -12,7 +12,7 @@
   <style type="text/css"><![CDATA[
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht
index 337b9586537..1f4bfa99e25 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht
@@ -12,7 +12,7 @@
   <style type="text/css"><![CDATA[
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht
index 45b1d9c5e7d..f869d59a43a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht
@@ -17,7 +17,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht
index 04021c089bb..61142bf38ee 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht
@@ -17,7 +17,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht
index 5856ad23274..d0569d960c8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht
@@ -4428,7 +4428,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -4440,14 +4440,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-alignment-orthogonal-vlr-003" class="ahem">
       <tr>
         <td rowspan="1" title="text baseline alignment of inline-block in orthogonal flow">
@@ -5068,7 +5060,7 @@
       <tr>
         <td rowspan="1" title="vertical-lr Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5076,7 +5068,55 @@
       <tr>
         <td rowspan="1" title="vertical-rl Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5268,22 +5308,6 @@
       <tr>
         <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
           <a href="text-baseline-007.xht">text-baseline-007</a></td>
-        <td><a href="reference/text-baseline-007-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-008" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-008.xht">text-baseline-008</a></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-009.xht">text-baseline-009</a></td>
         <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list
index 2ed3eb1cc82..d096d1035ab 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list
@@ -549,9 +549,8 @@ inline-block-alignment-003.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht
 inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-007.xht == reference/inline-block-alignment-007-ref.xht
+inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-009.xht == reference/inline-block-alignment-009-ref.xht
 inline-block-alignment-orthogonal-vlr-003.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
 inline-block-alignment-orthogonal-vlr-005.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
 inline-block-alignment-orthogonal-vrl-002.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
@@ -629,8 +628,14 @@ table-column-order-002.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-003.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-004.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-005.xht == reference/block-flow-direction-001-ref.xht
-table-progression-001-vlr.xht == reference/table-progression-001-ref.xht
-table-progression-001-vrl.xht == reference/table-progression-001-ref.xht
+table-progression-001-vlr.xht == table-progression-001-ref.orngtml
+table-progression-001-vrl.xht == table-progression-001-ref.orngtml
+table-progression-002-vlr.xht == table-progression-002-ref.orngtml
+table-progression-002-vrl.xht == table-progression-002-ref.orngtml
+table-progression-003-vlr.xht == table-progression-001-ref.orngtml
+table-progression-003-vrl.xht == table-progression-001-ref.orngtml
+table-progression-004-vlr.xht == table-progression-002-ref.orngtml
+table-progression-004-vrl.xht == table-progression-002-ref.orngtml
 text-align-vlr-003.xht == reference/ref-filled-green-100px-square.xht
 text-align-vlr-005.xht == reference/ref-filled-green-100px-square.xht
 text-align-vlr-007.xht == reference/ref-filled-green-100px-square.xht
@@ -654,9 +659,7 @@ text-baseline-003.xht == reference/text-baseline-002-ref.xht
 text-baseline-004.xht == reference/text-baseline-002-ref.xht
 text-baseline-005.xht == reference/text-baseline-002-ref.xht
 text-baseline-006.xht == reference/text-baseline-006-ref.xht
-text-baseline-007.xht == reference/text-baseline-007-ref.xht
-text-baseline-008.xht == reference/text-baseline-006-ref.xht
-text-baseline-009.xht == reference/text-baseline-006-ref.xht
+text-baseline-007.xht == reference/text-baseline-006-ref.xht
 text-combine-upright-decorations-001.xht == reference/text-combine-upright-decorations-001.xht
 text-combine-upright-inherit-all-001.xht == reference/text-combine-upright-inherit-all-001.xht
 text-combine-upright-inherit-all-002.xht == reference/text-combine-upright-inherit-all-002.xht
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht
index 5f4df1d4530..4f2ef3415d1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht
@@ -1,14 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-<link href="reference/table-progression-001-ref.xht" rel="match" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
 <meta content="This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert" />
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
 
 <style>
   .test {
     writing-mode: vertical-lr;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,33 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,54 +59,54 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
   </td></tr></tbody><tbody>
     <tr>
       <td rowspan="3">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
       <td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
 </td></tr></tbody></table>
 
 <table class="test" dir="rtl">
   <thead>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></thead><tfoot>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></tfoot><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="2" rowspan="2">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td rowspan="3">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
 </td></tr></tbody></table>
 
@@ -90,22 +114,23 @@
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
+    </td><td class="orng">
     </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="navy">
+
   </td></tr><tr>
     <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
+    </td><td class="yllw">
+    </td><td class="pink">
     </td><td rowspan="2">
-    </td><td class="b">
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht
index 0f243e8f0e4..da278075005 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht
@@ -1,14 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-<link href="reference/table-progression-001-ref.xht" rel="match" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
 <meta content="This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert" />
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
 
 <style>
   .test {
     writing-mode: vertical-rl;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,32 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,27 +58,27 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></thead><tfoot>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></tfoot><tbody>
     <tr>
       <td rowspan="3">
       </td><td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
 </td></tr></tbody></table>
 
@@ -63,48 +86,48 @@
   <thead>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
       </td><td rowspan="3">
     </td></tr><tr>
       <td colspan="2" rowspan="2">
-      </td><td class="f">
+      </td><td class="pink">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
 </td></tr></tbody></table>
 
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
   </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht
new file mode 100644
index 00000000000..4ea3b3fb4f0
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua" />
+  <col class="blue" />
+  <col span="2" class="navy" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="navy" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht
new file mode 100644
index 00000000000..933f6539936
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua" />
+  <col class="blue" />
+  <col span="2" class="navy" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="navy" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht
new file mode 100644
index 00000000000..83b7dc8241b
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht
new file mode 100644
index 00000000000..1ec2a45c556
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht
new file mode 100644
index 00000000000..bcc840e6c9e
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht
new file mode 100644
index 00000000000..9bb5a65cfdf
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht
index 5d2268830bd..49d091a3384 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht
@@ -3,9 +3,8 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
     <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-007-ref.xht" />
+    <link rel="match" href="reference/text-baseline-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
@@ -33,7 +32,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht
deleted file mode 100644
index 93b735c2950..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-006-ref.xht" />
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#rl-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-rl;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="rl-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht
deleted file mode 100644
index 14b3f8f5c29..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-006-ref.xht" />
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht
index 406e394caf2..4046251e9c8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht
index 6b5f54eed4f..2c874362d74 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht
index 1d8493bf835..b2465c807fd 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht
index 853539122b1..0f0ded18c28 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht
index 445c58d7a3b..e5ef9fd23e9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht
index 85cc28e0c13..c1504296979 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht
index 0b686cad80f..60fb10f9f7d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht
index be541bfae6c..aa9c800dfe0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht
index 48e5e323f36..02398feedd8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht
@@ -17,7 +17,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht
index 2c50ec5beb1..6e45897fc08 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht
@@ -16,7 +16,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht
index 65d2d879d7b..c9724ae3bd2 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht
index 4027e20fcc3..d5395f8d233 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht
@@ -16,7 +16,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht
index 2b76537a030..bc4df1b6a75 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht
index 3cd01af1fac..87734fa7ca8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht
@@ -21,7 +21,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht
index bf26957e8bb..e501555f466 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht
index 82b26c1a9b3..cd83250492b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht
@@ -21,7 +21,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht
index a7746542aa6..dc8746dd85c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht
index 4021aaa6552..6ec48b6c90f 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht
index a4c3bb8e7c2..4950fa07367 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht
@@ -19,10 +19,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht
index 2cb05ededb4..8c26f28062c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht
@@ -27,22 +27,22 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(164 Tests)</td></tr>
+      <td>(172 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Introduction to Vertical Text</a></th>
-      <td>(84 Tests)</td></tr>
+      <td>(90 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(34 Tests)</td></tr>
+      <td>(31 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
         Introduction to Vertical Text Layout</a></th>
-      <td>(25 Tests)</td></tr>
+      <td>(29 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-2.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-2.xht
index 064a2f7e5d9..cf853a1987d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-2.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-2.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline Direction and Bidirectionality (164 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (172 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1102,7 +1102,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#direction">2.1 Specifying Directionality: the direction property</a></th></tr>
-      <!-- 22 tests -->
+      <!-- 30 tests -->
       <tr id="direction-001-2.1" class="primary">
         <td><strong>
             <a href="direction-001.xht">direction-001</a></strong></td>
@@ -1345,6 +1345,98 @@
           </ul>
         </td>
       </tr>
+      <tr id="table-progression-001-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-001-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-2.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-2.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.1.#propdef-direction">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-3.xht
index b0db598fed4..2c67433470d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-3.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text (84 tests)</h2>
+  <h2>Introduction to Vertical Text (90 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -40,7 +40,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s3.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode">3.1 Block Flow Direction: the writing-mode property</a></th></tr>
-      <!-- 68 tests -->
+      <!-- 74 tests -->
       <tr id="block-flow-direction-001-3.1" class="primary ahem">
         <td><strong>
             <a href="block-flow-direction-001.xht">block-flow-direction-001</a></strong></td>
@@ -748,22 +748,92 @@
       <tr id="table-progression-001-vlr-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-lr Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
           </ul>
         </td>
       </tr>
       <tr id="table-progression-001-vrl-3.1" class="primary">
         <td><strong>
             <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></strong></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td></td>
         <td>vertical-rl Table Row/Rowgroup/Cell Ordering
           <ul class="assert">
             <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-002-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+            <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></strong></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-3.1" class="primary">
+        <td><strong>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></strong></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-4.xht
index e51dd69afff..ab467fc9288 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Inline-level Alignment (34 tests)</h2>
+  <h2>Inline-level Alignment (31 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -49,7 +49,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.2">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">4.2 Text Baselines</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 8 tests -->
       <tr id="central-baseline-alignment-002-4.2" class="primary ahem">
         <td><strong>
             <a href="central-baseline-alignment-002.xht">central-baseline-alignment-002</a></strong></td>
@@ -130,7 +130,7 @@
       <tr id="text-baseline-007-4.2" class="primary ahem">
         <td><strong>
             <a href="text-baseline-007.xht">text-baseline-007</a></strong></td>
-        <td><a href="reference/text-baseline-007-ref.xht">=</a> </td>
+        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text baseline alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -138,28 +138,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="text-baseline-008-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-008.xht">text-baseline-008</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="text-baseline-009-4.2" class="primary ahem">
-        <td><strong>
-            <a href="text-baseline-009.xht">text-baseline-009</a></strong></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>text baseline alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s4.2.#alphabetic-baseline">
       <!-- 0 tests -->
@@ -171,7 +149,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">4.3 Atomic Inline Baselines</a></th></tr>
-      <!-- 24 tests -->
+      <!-- 23 tests -->
       <tr id="baseline-inline-non-replaced-002-4.3" class="primary ahem">
         <td><strong>
             <a href="baseline-inline-non-replaced-002.xht">baseline-inline-non-replaced-002</a></strong></td>
@@ -296,7 +274,7 @@
       <tr id="inline-block-alignment-007-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></strong></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -315,17 +293,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-4.3" class="primary ahem">
-        <td><strong>
-            <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></strong></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inline-block-alignment-orthogonal-vlr-003-4.3" class="primary ahem">
         <td><strong>
             <a href="inline-block-alignment-orthogonal-vlr-003.xht">inline-block-alignment-orthogonal-vlr-003</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-5.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-5.xht
index f30bd707b69..a6512290c2c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-5.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Introduction to Vertical Text Layout (25 tests)</h2>
+  <h2>Introduction to Vertical Text Layout (29 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -55,7 +55,51 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s5.1">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation">5.1 Orienting Text: the text-orientation property</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 29 tests -->
+      <tr id="table-progression-003-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-003-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vlr-5.1" class="">
+        <td>
+            <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="table-progression-004-vrl-5.1" class="">
+        <td>
+            <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td></td>
+        <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+          <ul class="assert">
+            <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+          </ul>
+        </td>
+      </tr>
       <tr id="text-orientation-010-5.1" class="primary ahem font">
         <td><strong>
             <a href="text-orientation-010.xht">text-orientation-010</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht
index 86dc2e1cb38..c4203c3076f 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht
@@ -12,16 +12,15 @@
           }
 </style>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-007-ref.xht" />
+    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -59,7 +58,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht
deleted file mode 100644
index d1c77d2af7c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-009"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-009-ref.xht" />
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht
index db43e30af8a..ac07b7802f1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht
@@ -22,7 +22,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-005.xht
index cb55b4916fb..47b58bb2a67 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-005.xht
@@ -22,7 +22,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-002.xht
index 05b4df54877..b82efed28ca 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-002.xht
@@ -22,7 +22,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-004.xht
index ac5baea2e5e..75f0d288c4d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vrl-004.xht
@@ -22,7 +22,7 @@
     div#horiz-tb
     {
       color: orange;
-      font: 3.75em/1 Ahem; /* computes to 60px/60px */
+      font: 60px/1 Ahem; /* computes to 60px/60px */
       writing-mode: horizontal-tb;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vlr-003.xht
index 5012948927d..4f1abf13667 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vlr-003.xht
@@ -44,7 +44,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vrl-002.xht
index b6beec4d485..6597685b98b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/margin-vrl-002.xht
@@ -44,7 +44,7 @@
   .inner
     {
       background-color: yellow;
-      height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+      height: 50px;
       width: 50px;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
deleted file mode 100644
index 1305fb05c98..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-007-ref"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
deleted file mode 100644
index c33e65bb8b3..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-009-ref"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht
deleted file mode 100644
index 527b6273f7b..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reference</title>
-<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-
-<style>
-  table {
-    border-spacing: 0;
-    margin: 1em;
-  }
-  td {
-    width: 1em;
-    height: 1em;
-    border: solid gray;
-  }
-
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
-  caption { background: green; }
-</style>
-
-</head><body><p>Test passes if the following three tables look identical.
-
-</p><table>
-  <caption></caption>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
-  <tbody><tr>
-    <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
-  </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
-  </td></tr><tr>
-    <td class="c">
-    </td><td colspan="2" rowspan="2">
-    </td><td rowspan="2">
-  </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
-</td></tr></tbody></table>
-
-</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht
deleted file mode 100644
index 4e49fe23159..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test text-baseline-007-ref"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-01-29 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-
-  img
-  {
-    padding-left: 78px;
-    vertical-align: top;
-  }
-
-  img + br + img
-  {
-    padding-left: 30px;
-  }
-
-  img + br + img + br + img
-  {
-    padding-left: 102px;
-  }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div><img src="support/swatch-fuchsia.png" width="48" height="60" alt="Image download support must be enabled" /><br /><img src="support/swatch-fuchsia.png" width="96" height="120" alt="Image download support must be enabled" /><br /><img src="support/swatch-fuchsia.png" width="24" height="30" alt="Image download support must be enabled" /></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-011-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-011-ref.xht
index 84e76d57896..5d823921c01 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-011-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-011-ref.xht
@@ -21,7 +21,7 @@
   <style type="text/css"><![CDATA[
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-013-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-013-ref.xht
index 991fecd2822..26c370a1f26 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-013-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vlr-013-ref.xht
@@ -21,7 +21,7 @@
   <style type="text/css"><![CDATA[
   div
     {
-      margin-left: 0.5em;
+      margin-left: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-010-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-010-ref.xht
index 47b94d7a521..633a4a56523 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-010-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-010-ref.xht
@@ -26,7 +26,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-012-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-012-ref.xht
index 475d597fa06..e7f39d25e65 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-012-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/text-indent-vrl-012-ref.xht
@@ -26,7 +26,7 @@
 
   div
     {
-      margin-right: 0.5em;
+      margin-right: 8px;
     }
 
   img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest-toc.xht
index 5856ad23274..d0569d960c8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest-toc.xht
@@ -4428,7 +4428,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -4440,14 +4440,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-alignment-orthogonal-vlr-003" class="ahem">
       <tr>
         <td rowspan="1" title="text baseline alignment of inline-block in orthogonal flow">
@@ -5068,7 +5060,7 @@
       <tr>
         <td rowspan="1" title="vertical-lr Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vlr.xht">table-progression-001-vlr</a></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5076,7 +5068,55 @@
       <tr>
         <td rowspan="1" title="vertical-rl Table Row/Rowgroup/Cell Ordering">
           <a href="table-progression-001-vrl.xht">table-progression-001-vrl</a></td>
-        <td><a href="reference/table-progression-001-ref.xht">=</a> </td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vlr.xht">table-progression-002-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-002-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl Table Column/Colgroup Ordering">
+          <a href="table-progression-002-vrl.xht">table-progression-002-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vlr.xht">table-progression-003-vlr</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-003-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering">
+          <a href="table-progression-003-vrl.xht">table-progression-003-vrl</a></td>
+        <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vlr" class="">
+      <tr>
+        <td rowspan="1" title="vertical-lr upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vlr.xht">table-progression-004-vlr</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="table-progression-004-vrl" class="">
+      <tr>
+        <td rowspan="1" title="vertical-rl upright orientation Table Column/Colgroup Ordering">
+          <a href="table-progression-004-vrl.xht">table-progression-004-vrl</a></td>
+        <td><a href="table-progression-002-ref.orngtml">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -5268,22 +5308,6 @@
       <tr>
         <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
           <a href="text-baseline-007.xht">text-baseline-007</a></td>
-        <td><a href="reference/text-baseline-007-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-008" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-008.xht">text-baseline-008</a></td>
-        <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
-    <tbody id="text-baseline-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
-          <a href="text-baseline-009.xht">text-baseline-009</a></td>
         <td><a href="reference/text-baseline-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest.list
index 2ed3eb1cc82..d096d1035ab 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reftest.list
@@ -549,9 +549,8 @@ inline-block-alignment-003.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht
 inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-007.xht == reference/inline-block-alignment-007-ref.xht
+inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-009.xht == reference/inline-block-alignment-009-ref.xht
 inline-block-alignment-orthogonal-vlr-003.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
 inline-block-alignment-orthogonal-vlr-005.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
 inline-block-alignment-orthogonal-vrl-002.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht
@@ -629,8 +628,14 @@ table-column-order-002.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-003.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-004.xht == reference/block-flow-direction-001-ref.xht
 table-column-order-005.xht == reference/block-flow-direction-001-ref.xht
-table-progression-001-vlr.xht == reference/table-progression-001-ref.xht
-table-progression-001-vrl.xht == reference/table-progression-001-ref.xht
+table-progression-001-vlr.xht == table-progression-001-ref.orngtml
+table-progression-001-vrl.xht == table-progression-001-ref.orngtml
+table-progression-002-vlr.xht == table-progression-002-ref.orngtml
+table-progression-002-vrl.xht == table-progression-002-ref.orngtml
+table-progression-003-vlr.xht == table-progression-001-ref.orngtml
+table-progression-003-vrl.xht == table-progression-001-ref.orngtml
+table-progression-004-vlr.xht == table-progression-002-ref.orngtml
+table-progression-004-vrl.xht == table-progression-002-ref.orngtml
 text-align-vlr-003.xht == reference/ref-filled-green-100px-square.xht
 text-align-vlr-005.xht == reference/ref-filled-green-100px-square.xht
 text-align-vlr-007.xht == reference/ref-filled-green-100px-square.xht
@@ -654,9 +659,7 @@ text-baseline-003.xht == reference/text-baseline-002-ref.xht
 text-baseline-004.xht == reference/text-baseline-002-ref.xht
 text-baseline-005.xht == reference/text-baseline-002-ref.xht
 text-baseline-006.xht == reference/text-baseline-006-ref.xht
-text-baseline-007.xht == reference/text-baseline-007-ref.xht
-text-baseline-008.xht == reference/text-baseline-006-ref.xht
-text-baseline-009.xht == reference/text-baseline-006-ref.xht
+text-baseline-007.xht == reference/text-baseline-006-ref.xht
 text-combine-upright-decorations-001.xht == reference/text-combine-upright-decorations-001.xht
 text-combine-upright-inherit-all-001.xht == reference/text-combine-upright-inherit-all-001.xht
 text-combine-upright-inherit-all-002.xht == reference/text-combine-upright-inherit-all-002.xht
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht
index 5f4df1d4530..4f2ef3415d1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht
@@ -1,14 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-<link href="reference/table-progression-001-ref.xht" rel="match" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
 <meta content="This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert" />
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
 
 <style>
   .test {
     writing-mode: vertical-lr;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,33 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,54 +59,54 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
   </td></tr></tbody><tbody>
     <tr>
       <td rowspan="3">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
       <td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
 </td></tr></tbody></table>
 
 <table class="test" dir="rtl">
   <thead>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></thead><tfoot>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></tfoot><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="2" rowspan="2">
-      </td><td class="g">
+      </td><td class="yllw">
       </td><td rowspan="3">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
     </td></tr><tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
 </td></tr></tbody></table>
 
@@ -90,22 +114,23 @@
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
+    </td><td class="orng">
     </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="navy">
+
   </td></tr><tr>
     <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
+    </td><td class="yllw">
+    </td><td class="pink">
     </td><td rowspan="2">
-    </td><td class="b">
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht
index 0f243e8f0e4..da278075005 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht
@@ -1,14 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl Table Row/Rowgroup/Cell Ordering</title>
 <link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
-<link href="reference/table-progression-001-ref.xht" rel="match" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
 <meta content="This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert" />
 <link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
 
 <style>
   .test {
     writing-mode: vertical-rl;
   }
+  [dir=rtl] {
+    direction: rtl;
+  }
 
   table {
     border-spacing: 0;
@@ -20,14 +25,32 @@
     border: solid gray;
   }
 
-  .a { background: navy}
-  .b { background: blue }
-  .c { background: aqua }
-  .d { background: teal }
-  .e { background: purple }
-  .f { background: fuchsia }
-  .g { background: yellow }
-  .h { background: orange }
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+
+  /* These rules must have no effect. */
+  .test thead,
+  .test tfoot,
+  .test tbody,
+  .test tr,
+  .test td {
+    writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] thead,
+  .test[dir=rtl] tfoot,
+  .test[dir=rtl] tbody,
+  .test[dir=rtl] tr,
+  .test[dir=rtl] td {
+    direction: ltr;
+  }
 </style>
 
 </head><body><p>Test passes if the following three tables look identical.
@@ -35,27 +58,27 @@
 </p><table class="test">
   <thead>
     <tr>
-      <td class="a">
-      </td><td class="b">
+      <td class="navy">
+      </td><td class="blue">
       </td><td colspan="2">
   </td></tr></thead><tfoot>
     <tr>
-      <td colspan="2">
-      </td><td class="c">
-      </td><td class="d">
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
   </td></tr></tfoot><tbody>
     <tr>
       <td rowspan="3">
       </td><td colspan="2">
-      </td><td class="e">
+      </td><td class="purp">
     </td></tr><tr>
-      <td class="f">
+      <td class="pink">
       </td><td colspan="2" rowspan="2">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
-      <td class="h">
+      <td class="orng">
       </td><td colspan="3">
 </td></tr></tbody></table>
 
@@ -63,48 +86,48 @@
   <thead>
     <tr>
       <td colspan="2">
-      </td><td class="b">
-      </td><td class="a">
+      </td><td class="blue">
+      </td><td class="navy">
   </td></tr></thead><tfoot>
     <tr>
-      <td class="d">
-      </td><td class="c">
-      </td><td colspan="2">
+      <td class="teal">
+      </td><td class="aqua">
+      </td><td colspan="2"> 
   </td></tr></tfoot><tbody>
     <tr>
-      <td class="e">
+      <td class="purp">
       </td><td colspan="2">
       </td><td rowspan="3">
     </td></tr><tr>
       <td colspan="2" rowspan="2">
-      </td><td class="f">
+      </td><td class="pink">
     </td></tr><tr>
-      <td class="g">
+      <td class="yllw">
   </td></tr></tbody><tbody>
     <tr>
       <td colspan="3">
-      </td><td class="h">
+      </td><td class="orng">
 </td></tr></tbody></table>
 
 <table class="reference">
   <tbody><tr>
     <td rowspan="2">
-    </td><td class="h">
-    </td><td colspan="3">
-    </td><td class="a">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
   </td></tr><tr>
-    <td rowspan="3">
-    </td><td class="g">
-    </td><td class="f">
-    </td><td rowspan="2">
-    </td><td class="b">
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
   </td></tr><tr>
-    <td class="c">
+    <td class="aqua">
     </td><td colspan="2" rowspan="2">
     </td><td rowspan="2">
   </td></tr><tr>
-    <td class="d">
-    </td><td class="e">
+    <td class="teal">
+    </td><td class="purp">
 </td></tr></tbody></table>
 
 </body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht
new file mode 100644
index 00000000000..4ea3b3fb4f0
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-rl;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua" />
+  <col class="blue" />
+  <col span="2" class="navy" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="navy" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht
new file mode 100644
index 00000000000..933f6539936
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert" />
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+
+  /* These declarations must have no effect. */
+  .test col,
+  .test colgroup {
+    writing-mode: horizontal-tb;
+    writing-mode: vertical-lr;
+    direction: rtl;
+  }
+  .test[dir=rtl] col,
+  .test[dir=rtl] colgroup {
+    direction: ltr;
+  }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="aqua" />
+  <col class="blue" />
+  <col span="2" class="navy" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="aqua"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="navy" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht
new file mode 100644
index 00000000000..83b7dc8241b
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td class="yllw">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="pink">
+    </td></tr><tr>
+      <td colspan="2">
+      </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht
new file mode 100644
index 00000000000..1ec2a45c556
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-001-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    margin: 1em;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+    border: solid gray;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+  .purp { background: purple }
+  .pink { background: fuchsia }
+  .yllw { background: yellow }
+  .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="test">
+  <thead>
+    <tr>
+      <td class="navy">
+      </td><td class="blue">
+      </td><td colspan="2">
+  </td></tr></thead><tfoot>
+    <tr>
+      <td colspan="2"> 
+      </td><td class="aqua">
+      </td><td class="teal">
+  </td></tr></tfoot><tbody>
+    <tr>
+      <td rowspan="3">
+      </td><td colspan="2">
+      </td><td class="purp">
+    </td></tr><tr>
+      <td class="pink">
+      </td><td colspan="2" rowspan="2">
+    </td></tr><tr>
+      <td class="yllw">
+  </td></tr></tbody><tbody>
+    <tr>
+      <td class="orng">
+      </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr>
+    <td rowspan="2">
+    </td><td class="orng">
+    </td><td colspan='3"'>
+    </td><td class="navy">
+  </td></tr><tr>
+    <td rowspan='3"'>
+    </td><td class="yllw">
+    </td><td class="pink">
+    </td><td rowspan='2"'>
+    </td><td class="blue">
+  </td></tr><tr>
+    <td class="aqua">
+    </td><td colspan="2" rowspan="2">
+    </td><td rowspan="2">
+  </td></tr><tr>
+    <td class="teal">
+    </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht
new file mode 100644
index 00000000000..bcc840e6c9e
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-lr upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht
new file mode 100644
index 00000000000..9bb5a65cfdf
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: vertical-rl upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad" />
+<link href="table-progression-002-ref.orngtml" rel="match" />
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help" />
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help" />
+
+<style>
+  .test {
+    writing-mode: vertical-rl;
+    text-orientation: upright;
+  }
+  [dir=rtl] {
+    direction: rtl;
+  }
+
+  table {
+    border-spacing: 0;
+    border: solid gray;
+    margin: 1em;
+    float: left;
+  }
+  td {
+    width: 1em;
+    height: 1em;
+  }
+
+  .navy { background: navy}
+  .blue { background: blue }
+  .aqua { background: aqua }
+  .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+  <colgroup><col span="2" class="navy" />
+  <col class="blue" />
+  <col span="2" class="aqua" />
+  </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+  <colgroup span="2" class="navy"></colgroup>
+  <colgroup>
+    <col class="blue" />
+    <col span="2" class="aqua" />
+  </colgroup>
+  <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+  <tbody><tr><td class="navy">
+  </td></tr><tr><td class="navy">
+  </td></tr><tr><td class="blue">
+  </td></tr><tr><td class="aqua">
+  </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht
index 6d35b00ede4..acff5d7373a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht
@@ -12,9 +12,8 @@
           }
 </style>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
     <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-007-ref.xht" />
+    <link rel="match" href="reference/text-baseline-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
@@ -42,7 +41,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht
deleted file mode 100644
index 541c63551f0..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test text-baseline-008"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-006-ref.xht" />
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#rl-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-rl;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="rl-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht
deleted file mode 100644
index bad9aaa9293..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test text-baseline-009"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-02-20 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
-    <link rel="match" href="reference/text-baseline-006-ref.xht" />
-    <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1.5 Ahem; /* computes to 60px/90px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    span#fuchsia120
-    {
-      font-size: 2em; /* computes to 120px */
-    }
-
-    span#fuchsia30
-    {
-      font-size: 0.5em; /* computes to 30px */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-003.xht
index a5a283170dd..4e47f60464b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-003.xht
@@ -25,7 +25,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-005.xht
index 859f3c1a93f..9870036516b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-005.xht
@@ -25,7 +25,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-007.xht
index 1088eb4a329..d301c381a74 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-007.xht
@@ -25,7 +25,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-009.xht
index 01a9f9bdef4..62c6b82d32b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-009.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-009.xht
@@ -25,7 +25,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-011.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-011.xht
index ba0a6e1b034..6ed69bcccb2 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-011.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-011.xht
@@ -30,7 +30,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-013.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-013.xht
index b93f6dca887..ed94af43f46 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-013.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-013.xht
@@ -30,7 +30,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-015.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-015.xht
index 5002f72bf8e..c10d4210e69 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-015.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-015.xht
@@ -30,7 +30,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-017.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-017.xht
index 3b9307212de..18706825a6b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-017.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vlr-017.xht
@@ -30,7 +30,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-002.xht
index b4789bd988c..aa8624fb17a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-002.xht
@@ -26,7 +26,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-004.xht
index 5da7a7c2537..a91ea32e100 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-004.xht
@@ -25,7 +25,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-006.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-006.xht
index 6306c5a481d..215cdc5ec82 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-006.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-006.xht
@@ -25,7 +25,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-008.xht
index bacebdd72a4..8fa5ee20744 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-008.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-008.xht
@@ -25,7 +25,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-010.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-010.xht
index d148b1dac65..ae45b0aee3d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-010.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-010.xht
@@ -30,7 +30,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-012.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-012.xht
index 3c3606c3cf3..5f0bb9a275a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-012.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-012.xht
@@ -30,7 +30,7 @@
   div
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 320px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-014.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-014.xht
index dbba4268901..46280aabf3f 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-014.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-014.xht
@@ -30,7 +30,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-016.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-016.xht
index 7384c9ac28d..283b591a985 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-016.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-indent-vrl-016.xht
@@ -30,7 +30,7 @@
   div#containing-block
     {
       color: green;
-      font: 5em/1 Ahem; /* computes to 80px/80px */
+      font: 80px/1 Ahem; /* computes to 80px/80px */
       height: 320px;
       width: 160px;
     }
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-001.xht
index e7026e4d5ab..62a0daed6d5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-001.xht
@@ -28,10 +28,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-right-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-right-001.xht
index e0b16a0481d..d4c7906087e 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-right-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-sideways-right-001.xht
@@ -28,10 +28,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-upright-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-upright-001.xht
index 47cea914f76..d6e930d494a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-upright-001.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/text-orientation-upright-001.xht
@@ -28,10 +28,10 @@
 				float: left;
 				color: blue;
 				font-family: "DejaVuSerifBook";
-				font-size: 1.875em; /* equivalent to 30px */
+				font-size: 30px;
 				line-height: 1.4; /* equivalent to 42px:
-				so that top-half-leading is 6px
-				and bottom-half-leading is 6px */
+				so that top-half-leading outside content is 6px
+				and bottom-half-leading outside content is 6px */
 				margin: 10px;
 			}
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/toc.xht
index 2cb05ededb4..8c26f28062c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/toc.xht
@@ -27,22 +27,22 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(164 Tests)</td></tr>
+      <td>(172 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
         Introduction to Vertical Text</a></th>
-      <td>(84 Tests)</td></tr>
+      <td>(90 Tests)</td></tr>
     </tbody>
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(34 Tests)</td></tr>
+      <td>(31 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
         Introduction to Vertical Text Layout</a></th>
-      <td>(25 Tests)</td></tr>
+      <td>(29 Tests)</td></tr>
     </tbody>
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm
index 14cecf80c16..cb7ed85a288 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm
@@ -11578,7 +11578,7 @@
       <tr id="universal-selector-005-12.5.1.#propdef-list-style-image" class="image">
         <td>
             <a href="universal-selector-005.htm">universal-selector-005</a></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
index 9ad3b6b75ab..6f02eb508cf 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
@@ -159,7 +159,7 @@
       <tr id="grouping-000-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-000.htm">grouping-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.htm">=</a> <a href="reference/grouping-000-notref.htm">&#x2260;</a> </td>
         <td></td>
         <td>Selectors: Grouping
           <ul class="assert">
@@ -170,7 +170,7 @@
       <tr id="grouping-001-5.2.1" class="primary invalid">
         <td><strong>
             <a href="grouping-001.htm">grouping-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.htm">=</a> <a href="reference/grouping-000-notref.htm">&#x2260;</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Selectors: Grouping: Invalid grouping
           <ul class="assert">
@@ -181,7 +181,7 @@
       <tr id="grouping-002-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-002.htm">grouping-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-002-ref.htm">=</a> <a href="reference/grouping-002-notref.htm">&#x2260;</a> </td>
         <td></td>
         <td>Condensing selectors
           <ul class="assert">
@@ -204,7 +204,7 @@
       <tr id="universal-selector-001-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-001.htm">universal-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-001-ref.htm">=</a> <a href="reference/universal-selector-001-notref.htm">&#x2260;</a> </td>
         <td></td>
         <td>Universal selector
           <ul class="assert">
@@ -215,7 +215,7 @@
       <tr id="universal-selector-002-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-002.htm">universal-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-002-ref.htm">=</a> <a href="reference/universal-selector-002-notref.htm">&#x2260;</a> </td>
         <td></td>
         <td>Implied universal selector for pseudo selector
           <ul class="assert">
@@ -248,7 +248,7 @@
       <tr id="universal-selector-005-5.3" class="primary image">
         <td><strong>
             <a href="universal-selector-005.htm">universal-selector-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
@@ -276,7 +276,7 @@
       <tr id="type-selector-001-5.4" class="primary">
         <td><strong>
             <a href="type-selector-001.htm">type-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/type-selector-001-ref.htm">=</a> </td>
         <td></td>
         <td>Type selectors
           <ul class="assert">
@@ -320,7 +320,7 @@
       <tr id="descendant-selector-000-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-000.htm">descendant-selector-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.htm">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors
           <ul class="assert">
@@ -331,7 +331,7 @@
       <tr id="descendant-selector-001-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-001.htm">descendant-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.htm">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors and universal selector
           <ul class="assert">
@@ -353,7 +353,7 @@
       <tr id="descendent-selector-002-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-002.htm">descendent-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.htm">=</a> </td>
         <td></td>
         <td>Descendent selector
           <ul class="assert">
@@ -364,7 +364,7 @@
       <tr id="descendent-selector-003-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-003.htm">descendent-selector-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.htm">=</a> </td>
         <td></td>
         <td>Descendent selector with additional element between
           <ul class="assert">
@@ -375,7 +375,7 @@
       <tr id="descendent-selector-004-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-004.htm">descendent-selector-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.htm">=</a> </td>
         <td></td>
         <td>Descendent selector with incorrect parent element
           <ul class="assert">
@@ -397,7 +397,7 @@
       <tr id="descendent-selector-006-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-006.htm">descendent-selector-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.htm">=</a> </td>
         <td></td>
         <td>Grandchild selection with no grandchildren
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-6.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-6.htm
index d45fa47da5b..5f159b9e173 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-6.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-6.htm
@@ -1102,7 +1102,7 @@
       <tr id="style-attr-cascade-004-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-004.htm">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1110,7 +1110,7 @@
       <tr id="style-attr-cascade-005-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-005.htm">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
@@ -1222,7 +1222,7 @@
       <tr id="style-attr-cascade-004-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-004.htm">style-attr-cascade-004</a></strong></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1230,7 +1230,7 @@
       <tr id="style-attr-cascade-005-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-005.htm">style-attr-cascade-005</a></strong></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-9.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-9.htm
index 5f8e65b57fe..434db22f213 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-9.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-9.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model (1246 tests)</h2>
+  <h2>Visual formatting model (1245 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -1338,7 +1338,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.2.2">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">9.2.2 Inline-level elements and inline boxes</a></th></tr>
-      <!-- 20 tests -->
+      <!-- 19 tests -->
       <tr id="inline-block-alignment-002-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-002.htm">inline-block-alignment-002</a></td>
@@ -1397,7 +1397,7 @@
       <tr id="inline-block-alignment-007-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -1416,17 +1416,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-9.2.2" class="ahem">
-        <td>
-            <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inlines-002-9.2.2" class="primary">
         <td><strong>
             <a href="inlines-002.htm">inlines-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendant-selector-000.htm b/tests/wpt/css-tests/css21_dev/html4/descendant-selector-000.htm
index b4cdaf6cd2b..53be595bb0d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendant-selector-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendant-selector-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Selectors: Descendant selectors</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+  <link rel="match" href="reference/descendant-selector-000-ref.htm">
   <meta name="flags" content="">
   <meta name="assert" content="Browsers should apply each rule to the descendant elements">
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendant-selector-001.htm b/tests/wpt/css-tests/css21_dev/html4/descendant-selector-001.htm
index ceb207f394a..056c26bd461 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendant-selector-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendant-selector-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Selectors: Descendant selectors and universal selector</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+  <link rel="match" href="reference/descendant-selector-000-ref.htm">
   <meta name="flags" content="">
   <meta name="assert" content="Browsers should apply each rule to the descendant elements">
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-002.htm b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-002.htm
index a9e6e237253..ba315617ee1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-002.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+        <link rel="match" href="reference/descendent-selector-002-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Descendent selectors are applied only to descendents.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-003.htm b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-003.htm
index 55edbce1e59..e8438b00160 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-003.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector with additional element between</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+        <link rel="match" href="reference/descendent-selector-002-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Descendent selectors are applied to descendents even if additional elements separate parent and subject of selector.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-004.htm b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-004.htm
index 21cc1ff55d0..fd4f464a701 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-004.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector with incorrect parent element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+        <link rel="match" href="reference/descendent-selector-004-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Descendent selectors are applied only to descendents where the parent element matches.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-006.htm b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-006.htm
index 6b45c090a4a..565cf8dcb23 100644
--- a/tests/wpt/css-tests/css21_dev/html4/descendent-selector-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/descendent-selector-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Grandchild selection with no grandchildren</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors">
+        <link rel="match" href="reference/descendent-selector-004-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Grandchild selection is applied only to elements which have grandchildren.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/grouping-000.htm b/tests/wpt/css-tests/css21_dev/html4/grouping-000.htm
index 6d9c570a1bd..f551b936eb5 100644
--- a/tests/wpt/css-tests/css21_dev/html4/grouping-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/grouping-000.htm
@@ -4,6 +4,8 @@
   <title>CSS Test: Selectors: Grouping</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping">
+  <link rel="match" href="reference/grouping-000-ref.htm">
+  <link rel="mismatch" href="reference/grouping-000-notref.htm">
   <meta name="flags" content="">
   <meta name="assert" content="Browsers should apply the rule to all elements grouped">
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/grouping-001.htm b/tests/wpt/css-tests/css21_dev/html4/grouping-001.htm
index f453cf83edf..3e2bfb87c82 100644
--- a/tests/wpt/css-tests/css21_dev/html4/grouping-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/grouping-001.htm
@@ -4,6 +4,8 @@
   <title>CSS Test: Selectors: Grouping: Invalid grouping</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping">
+  <link rel="match" href="reference/grouping-000-ref.htm">
+  <link rel="mismatch" href="reference/grouping-000-notref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="Browsers should ignore an invalid grouping">
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/grouping-002.htm b/tests/wpt/css-tests/css21_dev/html4/grouping-002.htm
index 893e1742a03..225b4b2f62c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/grouping-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/grouping-002.htm
@@ -4,6 +4,8 @@
         <title>CSS Test: Condensing selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping">
+        <link rel="match" href="reference/grouping-002-ref.htm">
+        <link rel="mismatch" href="reference/grouping-002-notref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Selectors can be condensed into a single selector.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-007.htm b/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-007.htm
index f45eb1b0795..9e5074b06b3 100644
--- a/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-007.htm
@@ -3,16 +3,15 @@
   <head>
     <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
-    <link rel="match" href="reference/inline-block-alignment-007-ref.htm">
+    <link rel="match" href="reference/inline-block-alignment-006-ref.htm">
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -50,7 +49,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-009.htm b/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-009.htm
deleted file mode 100644
index cffdcdc9069..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/inline-block-alignment-009.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
-    <link rel="match" href="reference/inline-block-alignment-009-ref.htm">
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem">
-    <style type="text/css">
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/left-offset-position-fixed-001.htm b/tests/wpt/css-tests/css21_dev/html4/left-offset-position-fixed-001.htm
index 3d2e343cbd0..868fcb81cae 100644
--- a/tests/wpt/css-tests/css21_dev/html4/left-offset-position-fixed-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/left-offset-position-fixed-001.htm
@@ -3,7 +3,7 @@
   <head>
     <title>CSS Test: left:auto offset of position:fixed box in a position:relative containing block</title>
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">  <!-- 2015-09-17 -->
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#position-props" title="9.3.2 Box offsets: 'top', 'right', 'bottom', 'left'">
     <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
     <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#position-props">
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/descendant-selector-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/descendant-selector-000-ref.htm
new file mode 100644
index 00000000000..ebcfe0bcdb1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/descendant-selector-000-ref.htm
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+.orange {
+  border: thin solid orange;
+}
+.blue {
+  border: thin solid blue;
+}
+.fuchsia {
+  border: thin solid fuchsia;
+}
+</style>
+</head>
+<body>
+<p class="orange">This paragraph should have a thin orange border.</p>
+<div><p class="blue">This paragraph should have a thin blue border.</p></div>
+<h4><span class="fuchsia">This text should have a thin fuchsia border.</span></h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-002-ref.htm
new file mode 100644
index 00000000000..261a69ae901
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-002-ref.htm
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-004-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-004-ref.htm
new file mode 100644
index 00000000000..7242056dc9f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/descendent-selector-004-ref.htm
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+</head>
+<body>
+<p>Test passes if there is no red visible on the page.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-notref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-notref.htm
new file mode 100644
index 00000000000..00f04837ffe
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-notref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-ref.htm
new file mode 100644
index 00000000000..3f5599a1a14
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-000-ref.htm
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+body {
+  color: green;
+  font-weight: bold;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-notref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-notref.htm
new file mode 100644
index 00000000000..875c2307240
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-notref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-ref.htm
new file mode 100644
index 00000000000..c7513c981d1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/grouping-002-ref.htm
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+blockquote {
+  color: green;
+}
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-007-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-007-ref.htm
deleted file mode 100644
index dc08df26fba..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-007-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-  <meta name="flags" content="image">
-  <style type="text/css">
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled">
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-009-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-009-ref.htm
deleted file mode 100644
index 9594ecd1e81..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/reference/inline-block-alignment-009-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
-  <meta name="flags" content="image">
-  <style type="text/css">
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  </style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled">
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/ref-green-background.htm b/tests/wpt/css-tests/css21_dev/html4/reference/ref-green-background.htm
index 4aab4f0766a..894470fa500 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reference/ref-green-background.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/ref-green-background.htm
@@ -1,11 +1,16 @@
-<!DOCTYPE html>
-<html><head><meta charset="utf-8">
-<title>CSS Reference</title>
-<link href="http://www.intel.com" rel="author" title="Intel">
-<style>
-  div { background-color: green; color: white; }
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+p {
+  color: white;
+  background: green;
+}
 </style>
-</head><body>
-  <div>This should be white on green.</div>
-
-</body></html>
\ No newline at end of file
+</head>
+<body>
+<p>This should have a green background.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/ref-white-on-green-background.htm b/tests/wpt/css-tests/css21_dev/html4/reference/ref-white-on-green-background.htm
new file mode 100644
index 00000000000..4aab4f0766a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/ref-white-on-green-background.htm
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8">
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel">
+<style>
+  div { background-color: green; color: white; }
+</style>
+</head><body>
+  <div>This should be white on green.</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/type-selector-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/type-selector-001-ref.htm
new file mode 100644
index 00000000000..961f56b8014
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/type-selector-001-ref.htm
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+.green {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote class="green">Filler Text</blockquote>
+<div class="green">Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-notref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-notref.htm
new file mode 100644
index 00000000000..6943a1cfe65
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-notref.htm
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-ref.htm
new file mode 100644
index 00000000000..575c20a6c9a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-001-ref.htm
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-notref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-notref.htm
new file mode 100644
index 00000000000..d5593b9ad83
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-notref.htm
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-ref.htm
new file mode 100644
index 00000000000..b51b510099a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-002-ref.htm
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-005-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-005-ref.htm
new file mode 100644
index 00000000000..b9466762257
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/universal-selector-005-ref.htm
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<style type="text/css">
+body {
+  margin-left: 100px;
+}
+li {
+  list-style-image: url("support/cat.png");
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a <strong>cat image</strong>.</p>
+<ul>
+  <li>&nbsp;</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm b/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
index c90c5eee549..afa2fd60a00 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
@@ -23940,6 +23940,22 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendant-selector-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors">
+          <a href="descendant-selector-000.htm">descendant-selector-000</a></td>
+        <td><a href="reference/descendant-selector-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendant-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors and universal selector">
+          <a href="descendant-selector-001.htm">descendant-selector-001</a></td>
+        <td><a href="reference/descendant-selector-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-001" class="">
       <tr>
         <td rowspan="1" title="Descendent selector does not apply to parent element">
@@ -23948,6 +23964,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector">
+          <a href="descendent-selector-002.htm">descendent-selector-002</a></td>
+        <td><a href="reference/descendent-selector-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-003" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with additional element between">
+          <a href="descendent-selector-003.htm">descendent-selector-003</a></td>
+        <td><a href="reference/descendent-selector-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-004" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with incorrect parent element">
+          <a href="descendent-selector-004.htm">descendent-selector-004</a></td>
+        <td><a href="reference/descendent-selector-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-005" class="">
       <tr>
         <td rowspan="1" title="Grandchild selection with no children">
@@ -23956,6 +23996,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-006" class="">
+      <tr>
+        <td rowspan="1" title="Grandchild selection with no grandchildren">
+          <a href="descendent-selector-006.htm">descendent-selector-006</a></td>
+        <td><a href="reference/descendent-selector-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="direction-001" class="">
       <tr>
         <td rowspan="1" title="Direction set to 'ltr'">
@@ -27924,6 +27972,30 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="grouping-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping">
+          <a href="grouping-000.htm">grouping-000</a></td>
+        <td><a href="reference/grouping-000-ref.htm">=</a> <a href="reference/grouping-000-notref.htm">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping: Invalid grouping">
+          <a href="grouping-001.htm">grouping-001</a></td>
+        <td><a href="reference/grouping-000-ref.htm">=</a> <a href="reference/grouping-000-notref.htm">&#x2260;</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-002" class="">
+      <tr>
+        <td rowspan="1" title="Condensing selectors">
+          <a href="grouping-002.htm">grouping-002</a></td>
+        <td><a href="reference/grouping-002-ref.htm">=</a> <a href="reference/grouping-002-notref.htm">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Height using pixels with a minimum minus one value, -1px">
@@ -29120,7 +29192,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -29132,14 +29204,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-height-001" class="">
       <tr>
         <td rowspan="1" title="Test for height:auto on inline-block">
@@ -43491,7 +43555,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.htm">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -43499,7 +43563,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.htm">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -44591,6 +44655,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="type-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Type selectors">
+          <a href="type-selector-001.htm">type-selector-001</a></td>
+        <td><a href="reference/type-selector-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="unicode-bidi-001" class="">
       <tr>
         <td rowspan="1" title="Unicode-bidi set to 'normal'">
@@ -44791,6 +44863,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Universal selector">
+          <a href="universal-selector-001.htm">universal-selector-001</a></td>
+        <td><a href="reference/universal-selector-001-ref.htm">=</a> <a href="reference/universal-selector-001-notref.htm">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="universal-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Implied universal selector for pseudo selector">
+          <a href="universal-selector-002.htm">universal-selector-002</a></td>
+        <td><a href="reference/universal-selector-002-ref.htm">=</a> <a href="reference/universal-selector-002-notref.htm">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="universal-selector-003" class="">
       <tr>
         <td rowspan="1" title="Implied universal selector for class selector">
@@ -44807,6 +44895,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-005" class="image">
+      <tr>
+        <td rowspan="1" title="universal selector - list-style-image">
+          <a href="universal-selector-005.htm">universal-selector-005</a></td>
+        <td><a href="reference/universal-selector-005-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="unterminated-string-001" class="invalid">
       <tr>
         <td rowspan="1" title="Error handling of unterminated strings">
diff --git a/tests/wpt/css-tests/css21_dev/html4/reftest.list b/tests/wpt/css-tests/css21_dev/html4/reftest.list
index 02decff4313..b4dd00eec33 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest.list
@@ -3028,8 +3028,14 @@ delete-inline-in-blocks-middle-002.htm == reference/delete-inline-in-blocks-midd
 delete-inline-in-blocks-middle-003.htm == reference/delete-inline-in-blocks-middle-002-ref.htm
 descendant-display-none-001.htm == reference/ref-if-there-is-no-red.htm
 descendant-display-override-001.htm == reference/ref-if-there-is-no-red.htm
+descendant-selector-000.htm == reference/descendant-selector-000-ref.htm
+descendant-selector-001.htm == reference/descendant-selector-000-ref.htm
 descendent-selector-001.htm == reference/no-red-filler-text-ref.htm
+descendent-selector-002.htm == reference/descendent-selector-002-ref.htm
+descendent-selector-003.htm == reference/descendent-selector-002-ref.htm
+descendent-selector-004.htm == reference/descendent-selector-004-ref.htm
 descendent-selector-005.htm == reference/no-red-filler-text-ref.htm
+descendent-selector-006.htm == reference/descendent-selector-004-ref.htm
 direction-001.htm == reference/direction-001-ref.htm
 direction-002.htm == reference/direction-002-ref.htm
 direction-003.htm == reference/direction-002-ref.htm
@@ -3530,6 +3536,9 @@ grid-float-001.htm == reference/ref-filled-green-100px-square.htm
 grid-inline-float-001.htm == reference/ref-filled-green-100px-square.htm
 grid-inline-vertical-align-001.htm == reference/ref-filled-green-100px-square.htm
 grid-vertical-align-001.htm == reference/ref-filled-green-100px-square.htm
+grouping-000.htm == reference/grouping-000-ref.htm != reference/grouping-000-notref.htm
+grouping-001.htm == reference/grouping-000-ref.htm != reference/grouping-000-notref.htm
+grouping-002.htm == reference/grouping-002-ref.htm != reference/grouping-002-notref.htm
 height-001.htm == reference/height-001-ref.htm
 height-002.htm == reference/height-001-ref.htm
 height-003.htm == reference/height-003-ref.htm
@@ -3679,9 +3688,8 @@ inline-block-alignment-003.htm == reference/inline-block-alignment-003-ref.htm
 inline-block-alignment-004.htm == reference/inline-block-alignment-002-ref.htm
 inline-block-alignment-005.htm == reference/inline-block-alignment-003-ref.htm
 inline-block-alignment-006.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-007.htm == reference/inline-block-alignment-007-ref.htm
+inline-block-alignment-007.htm == reference/inline-block-alignment-006-ref.htm
 inline-block-alignment-008.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-009.htm == reference/inline-block-alignment-009-ref.htm
 inline-block-height-001.htm == reference/inline-block-height-001-ref.htm
 inline-block-height-002.htm == reference/inline-block-height-002-ref.htm
 inline-block-non-replaced-height-001.htm == reference/height-percentage-001-ref.htm
@@ -5488,8 +5496,8 @@ strings-000.htm == reference/ref-this-text-should-be-green.htm
 style-attr-cascade-001.htm == reference/ref-green.htm
 style-attr-cascade-002.htm == reference/ref-green.htm
 style-attr-cascade-003.htm == reference/ref-green.htm
-style-attr-cascade-004.htm == reference/ref-green-background.htm
-style-attr-cascade-005.htm == reference/ref-green-background.htm
+style-attr-cascade-004.htm == reference/ref-white-on-green-background.htm
+style-attr-cascade-005.htm == reference/ref-white-on-green-background.htm
 style-attr-cascade-006.htm == reference/ref-green.htm
 style-attr-cascade-007.htm == reference/style-attr-cascade-007.htm
 style-attr-specificity-001.htm == reference/ref-green-on-green.htm
@@ -5626,6 +5634,7 @@ top-offset-002.htm == reference/bottom-offset-001-ref.htm
 top-offset-003.htm == reference/top-offset-003-ref.htm
 top-offset-percentage-001.htm == reference/top-offset-percentage-001-ref.htm
 top-offset-percentage-002.htm == reference/left-offset-percentage-002-ref.htm
+type-selector-001.htm == reference/type-selector-001-ref.htm
 unicode-bidi-001.htm == reference/direction-002-ref.htm
 unicode-bidi-002.htm == reference/unicode-bidi-002-ref.htm
 unicode-bidi-003.htm == reference/direction-002-ref.htm
@@ -5651,8 +5660,11 @@ units-005.htm == reference/units-005-ref.htm
 units-006.htm == reference/units-006-ref.htm
 units-008.htm == reference/units-006-ref.htm
 units-009.htm == reference/units-006-ref.htm
+universal-selector-001.htm == reference/universal-selector-001-ref.htm != reference/universal-selector-001-notref.htm
+universal-selector-002.htm == reference/universal-selector-002-ref.htm != reference/universal-selector-002-notref.htm
 universal-selector-003.htm == reference/filler-text-below-green.htm
 universal-selector-004.htm == reference/filler-text-below-green.htm
+universal-selector-005.htm == reference/universal-selector-005-ref.htm
 unterminated-string-001.htm == reference/filler-text-below-green.htm
 uri-001.htm == reference/filler-text-below-green.htm
 uri-002.htm == reference/no-red-filler-text-ref.htm
diff --git a/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-004.htm b/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-004.htm
index 4d5ec12df57..c9cdc956720 100644
--- a/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-004.htm
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules">
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret">
-  <link rel="match" href="reference/ref-green-background.htm">
+  <link rel="match" href="reference/ref-white-on-green-background.htm">
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-005.htm b/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-005.htm
index c6b7b49c55a..00655a80c7e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/style-attr-cascade-005.htm
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules">
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret">
-  <link rel="match" href="reference/ref-green-background.htm">
+  <link rel="match" href="reference/ref-white-on-green-background.htm">
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/toc.htm b/tests/wpt/css-tests/css21_dev/html4/toc.htm
index 8694aa3a05e..58db03dc955 100644
--- a/tests/wpt/css-tests/css21_dev/html4/toc.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/toc.htm
@@ -62,7 +62,7 @@
     <tbody id="s9">
       <tr><th><a href="chapter-9.htm">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1246 Tests)</td></tr>
+      <td>(1245 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.htm">Chapter 10 - 
diff --git a/tests/wpt/css-tests/css21_dev/html4/type-selector-001.htm b/tests/wpt/css-tests/css21_dev/html4/type-selector-001.htm
index 0a70e22dc8d..0a318e9aceb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/type-selector-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/type-selector-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Type selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#type-selectors">
+        <link rel="match" href="reference/type-selector-001-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Basic type selectors apply to each type.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/universal-selector-001.htm b/tests/wpt/css-tests/css21_dev/html4/universal-selector-001.htm
index aa86f353b86..f88e6c796f6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/universal-selector-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/universal-selector-001.htm
@@ -4,6 +4,8 @@
         <title>CSS Test: Universal selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector">
+        <link rel="match" href="reference/universal-selector-001-ref.htm">
+        <link rel="mismatch" href="reference/universal-selector-001-notref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The universal selector applies to all elements.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/universal-selector-002.htm b/tests/wpt/css-tests/css21_dev/html4/universal-selector-002.htm
index 413a5eeec93..f8c514f4ba3 100644
--- a/tests/wpt/css-tests/css21_dev/html4/universal-selector-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/universal-selector-002.htm
@@ -4,6 +4,8 @@
         <title>CSS Test: Implied universal selector for pseudo selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector">
+        <link rel="match" href="reference/universal-selector-002-ref.htm">
+        <link rel="mismatch" href="reference/universal-selector-002-notref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="If the universal selector is not the only component of a simple pseudo selector the '*' can be omitted.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/universal-selector-005.htm b/tests/wpt/css-tests/css21_dev/html4/universal-selector-005.htm
index 8d5cb751403..d721f698d46 100644
--- a/tests/wpt/css-tests/css21_dev/html4/universal-selector-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/universal-selector-005.htm
@@ -11,6 +11,7 @@
   <link rel="author" title="Alexander Dawson" href="alexander_dawson(a)hotmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image">
+  <link rel="match" href="reference/universal-selector-005-ref.htm">
   <meta name="flags" content="image">
   <meta name="assert" content="The universal selector matches the name of any element type. 'list-style-image' applies to elements with 'display: list-item'.">
 
diff --git a/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
index da40fe6bf77..d9e57b31d9f 100644
--- a/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
@@ -7857,20 +7857,20 @@ html4/cascade-import-011.htm	5abf156afe2413731bc4ad87c9ddf62fb90cb4af	?
 xhtml1/cascade-import-011.xht	5abf156afe2413731bc4ad87c9ddf62fb90cb4af	?
 html4/cascade-import-012.htm	7b8edcaf0f14183657991fc67203cbdaae35569d	?
 xhtml1/cascade-import-012.xht	7b8edcaf0f14183657991fc67203cbdaae35569d	?
-html4/cascade-import-dynamic-001.htm	5bab109174bd7f53a05c357a62c79834e97f7f98	?
-xhtml1/cascade-import-dynamic-001.xht	5bab109174bd7f53a05c357a62c79834e97f7f98	?
-html4/cascade-import-dynamic-002.htm	a7fb2e11c41fea1f5cfe203aece009c2d44d5068	?
-xhtml1/cascade-import-dynamic-002.xht	a7fb2e11c41fea1f5cfe203aece009c2d44d5068	?
-html4/cascade-import-dynamic-003.htm	b3f396a6d930514adc8e910a51450340d40d8df1	?
-xhtml1/cascade-import-dynamic-003.xht	b3f396a6d930514adc8e910a51450340d40d8df1	?
-html4/cascade-import-dynamic-004.htm	e6c67673851d064992b3f3b906e3f21e77a81c92	?
-xhtml1/cascade-import-dynamic-004.xht	e6c67673851d064992b3f3b906e3f21e77a81c92	?
-html4/cascade-import-dynamic-005.htm	9bfcea9503cd5802bd8a1fa7c07465d6a1fd2056	?
-xhtml1/cascade-import-dynamic-005.xht	9bfcea9503cd5802bd8a1fa7c07465d6a1fd2056	?
-html4/cascade-import-dynamic-006.htm	37a809c867155025105254a40b1eb0fecba146c4	?
-xhtml1/cascade-import-dynamic-006.xht	37a809c867155025105254a40b1eb0fecba146c4	?
-html4/cascade-import-dynamic-control.htm	880148477f6b96ba980d9c3150f0dad41ca4ead1	?
-xhtml1/cascade-import-dynamic-control.xht	880148477f6b96ba980d9c3150f0dad41ca4ead1	?
+html4/cascade-import-dynamic-001.htm	021270fcd44bf9ac8f2dbe1b7a8e287a880c66cb	?
+xhtml1/cascade-import-dynamic-001.xht	021270fcd44bf9ac8f2dbe1b7a8e287a880c66cb	?
+html4/cascade-import-dynamic-002.htm	5dcbbb363284cbfd5e09d856f47cc1e791616bc9	?
+xhtml1/cascade-import-dynamic-002.xht	5dcbbb363284cbfd5e09d856f47cc1e791616bc9	?
+html4/cascade-import-dynamic-003.htm	b4133f7b78f2aa9812ebbfa99ec9887d60077dda	?
+xhtml1/cascade-import-dynamic-003.xht	b4133f7b78f2aa9812ebbfa99ec9887d60077dda	?
+html4/cascade-import-dynamic-004.htm	0391f275412b0e52cc5093c0cf7ef3253073693a	?
+xhtml1/cascade-import-dynamic-004.xht	0391f275412b0e52cc5093c0cf7ef3253073693a	?
+html4/cascade-import-dynamic-005.htm	4a60a35ba90e1fa996826fe89109646b94c6f00a	?
+xhtml1/cascade-import-dynamic-005.xht	4a60a35ba90e1fa996826fe89109646b94c6f00a	?
+html4/cascade-import-dynamic-006.htm	feca2186ba10a6453aea329e984a433729a43c8c	?
+xhtml1/cascade-import-dynamic-006.xht	feca2186ba10a6453aea329e984a433729a43c8c	?
+html4/cascade-import-dynamic-control.htm	958a017819531dab335bab4da8c108d51335a699	?
+xhtml1/cascade-import-dynamic-control.xht	958a017819531dab335bab4da8c108d51335a699	?
 html4/cascade-precedence-001.htm	826330e8fb45187c92a17a871f14711bac0db58c	?
 xhtml1/cascade-precedence-001.xht	826330e8fb45187c92a17a871f14711bac0db58c	?
 html4/cascade-precedence-002.htm	41e9c15a09904182939a51d5bae3c891486767e1	?
@@ -9629,22 +9629,22 @@ html4/descendant-display-none-001.htm	ec97525599ffd2239e713c90a5c47745ed92aeea	?
 xhtml1/descendant-display-none-001.xht	ec97525599ffd2239e713c90a5c47745ed92aeea	?
 html4/descendant-display-override-001.htm	8fee66e5f24c59663c0e11abf0be2d2ddd66a2cf	?
 xhtml1/descendant-display-override-001.xht	8fee66e5f24c59663c0e11abf0be2d2ddd66a2cf	?
-html4/descendant-selector-000.htm	c106ca2b043e503ac9c245fe10c895aff0905c1d	?
-xhtml1/descendant-selector-000.xht	c106ca2b043e503ac9c245fe10c895aff0905c1d	?
-html4/descendant-selector-001.htm	e6cf0481f3fb02dbbadfe3d50da98453f2c2c4ee	?
-xhtml1/descendant-selector-001.xht	e6cf0481f3fb02dbbadfe3d50da98453f2c2c4ee	?
+html4/descendant-selector-000.htm	46ec3dd542b4fe4875037ed280fbb5733cfe0e72	?
+xhtml1/descendant-selector-000.xht	46ec3dd542b4fe4875037ed280fbb5733cfe0e72	?
+html4/descendant-selector-001.htm	e23a1b102570e81db35e762fb9d4e02969f9376c	?
+xhtml1/descendant-selector-001.xht	e23a1b102570e81db35e762fb9d4e02969f9376c	?
 html4/descendent-selector-001.htm	11ab5da63b3f42ed71250c91136486e5b8a3c4cd	?
 xhtml1/descendent-selector-001.xht	11ab5da63b3f42ed71250c91136486e5b8a3c4cd	?
-html4/descendent-selector-002.htm	88cb1c03462749e54e1ec76a3b47cc8d7d4c9882	?
-xhtml1/descendent-selector-002.xht	88cb1c03462749e54e1ec76a3b47cc8d7d4c9882	?
-html4/descendent-selector-003.htm	8bf8e02dd855d18afae385e0d4d5fe0d1ac8d294	?
-xhtml1/descendent-selector-003.xht	8bf8e02dd855d18afae385e0d4d5fe0d1ac8d294	?
-html4/descendent-selector-004.htm	73766503b0964b343d3f36cb4c645673b4a560e1	?
-xhtml1/descendent-selector-004.xht	73766503b0964b343d3f36cb4c645673b4a560e1	?
+html4/descendent-selector-002.htm	f23668f5490f18d28602ba3b9a6d07da85a5fbd9	?
+xhtml1/descendent-selector-002.xht	f23668f5490f18d28602ba3b9a6d07da85a5fbd9	?
+html4/descendent-selector-003.htm	90992c8275f86951529170b31be51271411b3782	?
+xhtml1/descendent-selector-003.xht	90992c8275f86951529170b31be51271411b3782	?
+html4/descendent-selector-004.htm	81faee404c0c54087551e73a81e058832bfc97d3	?
+xhtml1/descendent-selector-004.xht	81faee404c0c54087551e73a81e058832bfc97d3	?
 html4/descendent-selector-005.htm	631da3319277f5ce15d01649a10ef2d8a044fa27	?
 xhtml1/descendent-selector-005.xht	631da3319277f5ce15d01649a10ef2d8a044fa27	?
-html4/descendent-selector-006.htm	33b12d03a89a2449d04aaf80331f6c67b05a9ca9	?
-xhtml1/descendent-selector-006.xht	33b12d03a89a2449d04aaf80331f6c67b05a9ca9	?
+html4/descendent-selector-006.htm	ffdeb0583f1d6f25d825bff85757715107f18b7d	?
+xhtml1/descendent-selector-006.xht	ffdeb0583f1d6f25d825bff85757715107f18b7d	?
 html4/descendent-selector-007.htm	9b3284e0cb3a8833f6a10c90716f9b6856caecbb	?
 xhtml1/descendent-selector-007.xht	9b3284e0cb3a8833f6a10c90716f9b6856caecbb	?
 html4/descendent-selector-008.htm	19b5c529fefa7740ee50680d2587f5b0c0a28ac7	?
@@ -12285,12 +12285,12 @@ html4/grid-inline-vertical-align-001.htm	e48c1cae6cb97ea4edd1f8aab243dcb996b821d
 xhtml1/grid-inline-vertical-align-001.xht	e48c1cae6cb97ea4edd1f8aab243dcb996b821db	?
 html4/grid-vertical-align-001.htm	a1efe31bf3a51583086fefe427d94665c7c72322	?
 xhtml1/grid-vertical-align-001.xht	a1efe31bf3a51583086fefe427d94665c7c72322	?
-html4/grouping-000.htm	c14e7c69f1cd37a0426473096a5f8ac1b305b4f9	?
-xhtml1/grouping-000.xht	c14e7c69f1cd37a0426473096a5f8ac1b305b4f9	?
-html4/grouping-001.htm	b3fac590ba2554a2264eb25f29bd4e50b7c7f393	?
-xhtml1/grouping-001.xht	b3fac590ba2554a2264eb25f29bd4e50b7c7f393	?
-html4/grouping-002.htm	0581de2b685acc087dfd6537d5b099fb27b3f74f	?
-xhtml1/grouping-002.xht	0581de2b685acc087dfd6537d5b099fb27b3f74f	?
+html4/grouping-000.htm	62a41fd8b8a715aaf7ae70a4f00b0cc3af55c016	?
+xhtml1/grouping-000.xht	62a41fd8b8a715aaf7ae70a4f00b0cc3af55c016	?
+html4/grouping-001.htm	a817c3fcfbf33e97186d8c2a7fa0b407498ad7a1	?
+xhtml1/grouping-001.xht	a817c3fcfbf33e97186d8c2a7fa0b407498ad7a1	?
+html4/grouping-002.htm	5e80f38cbf9b8269c2fa23cd00c45ebd7aa71ed0	?
+xhtml1/grouping-002.xht	5e80f38cbf9b8269c2fa23cd00c45ebd7aa71ed0	?
 html4/height-001.htm	26b30109c8f8042237eefcc3dee1cd8c6e1ea932	?
 xhtml1/height-001.xht	26b30109c8f8042237eefcc3dee1cd8c6e1ea932	?
 html4/height-002.htm	e3c7f7963d38e9e64ad7efff51e8bac7531341dd	?
@@ -12698,12 +12698,10 @@ html4/inline-block-alignment-005.htm	f22e9acf9997492e59bf06af71f147cf3a7ef60b	?
 xhtml1/inline-block-alignment-005.xht	f22e9acf9997492e59bf06af71f147cf3a7ef60b	?
 html4/inline-block-alignment-006.htm	d331ddb7afc3bbe931b343cfec50b6f142a10f55	?
 xhtml1/inline-block-alignment-006.xht	d331ddb7afc3bbe931b343cfec50b6f142a10f55	?
-html4/inline-block-alignment-007.htm	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	?
-xhtml1/inline-block-alignment-007.xht	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	?
+html4/inline-block-alignment-007.htm	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	?
+xhtml1/inline-block-alignment-007.xht	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	?
 html4/inline-block-alignment-008.htm	0c74b7bbf813193c08885b3d85823e5a2b4fb435	?
 xhtml1/inline-block-alignment-008.xht	0c74b7bbf813193c08885b3d85823e5a2b4fb435	?
-html4/inline-block-alignment-009.htm	011236f198ba8944faf000a6768995116784c55f	?
-xhtml1/inline-block-alignment-009.xht	011236f198ba8944faf000a6768995116784c55f	?
 html4/inline-block-height-001.htm	16420343ff1b3e203ff5c995965add545595a9a6	?
 xhtml1/inline-block-height-001.xht	16420343ff1b3e203ff5c995965add545595a9a6	?
 html4/inline-block-height-002.htm	13f6f7d3e9b65cb978c256d0f064517e544579c9	?
@@ -13174,8 +13172,8 @@ html4/left-offset-percentage-001.htm	2b1a8a647bc4659bb3ad604e611c62866bf83b37	?
 xhtml1/left-offset-percentage-001.xht	2b1a8a647bc4659bb3ad604e611c62866bf83b37	?
 html4/left-offset-percentage-002.htm	b01fa2a64b07ebb97c6b2aa6a4fde5c360545cec	?
 xhtml1/left-offset-percentage-002.xht	b01fa2a64b07ebb97c6b2aa6a4fde5c360545cec	?
-html4/left-offset-position-fixed-001.htm	ccdc4e630469a14bae852ca5ade5cfe442d6ac16	?
-xhtml1/left-offset-position-fixed-001.xht	ccdc4e630469a14bae852ca5ade5cfe442d6ac16	?
+html4/left-offset-position-fixed-001.htm	ef00d8c4e4949be47753fac480c33302bec380c0	?
+xhtml1/left-offset-position-fixed-001.xht	ef00d8c4e4949be47753fac480c33302bec380c0	?
 html4/letter-spacing-004.htm	35a1c7eb6a26207ef41c2a9a57418b8ba9c17bba	?
 xhtml1/letter-spacing-004.xht	35a1c7eb6a26207ef41c2a9a57418b8ba9c17bba	?
 html4/letter-spacing-005.htm	b41f3e19526acd39a3df86c8c1ba9930f86251dd	?
@@ -18021,10 +18019,10 @@ html4/style-attr-cascade-002.htm	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	?
 xhtml1/style-attr-cascade-002.xht	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	?
 html4/style-attr-cascade-003.htm	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	?
 xhtml1/style-attr-cascade-003.xht	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	?
-html4/style-attr-cascade-004.htm	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	?
-xhtml1/style-attr-cascade-004.xht	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	?
-html4/style-attr-cascade-005.htm	29da953d3c353f6f18e4dbdae63638d354c73df2	?
-xhtml1/style-attr-cascade-005.xht	29da953d3c353f6f18e4dbdae63638d354c73df2	?
+html4/style-attr-cascade-004.htm	002bed21e9e44e603e6c8431853eb0fd8c636dad	?
+xhtml1/style-attr-cascade-004.xht	002bed21e9e44e603e6c8431853eb0fd8c636dad	?
+html4/style-attr-cascade-005.htm	72e8f4b20c569e6bb4c3634639719332bc70a223	?
+xhtml1/style-attr-cascade-005.xht	72e8f4b20c569e6bb4c3634639719332bc70a223	?
 html4/style-attr-cascade-006.htm	5f31a718bbe6eedd436062d4e68e5878b74aa581	?
 xhtml1/style-attr-cascade-006.xht	5f31a718bbe6eedd436062d4e68e5878b74aa581	?
 html4/style-attr-cascade-007.htm	d59eaebdf15f153ab8c1016e07344df3bed2dbd2	?
@@ -19607,8 +19605,8 @@ html4/top-offset-percentage-001.htm	919fa6e32b97e1c39f87ae73b0f0e020dd157971	?
 xhtml1/top-offset-percentage-001.xht	919fa6e32b97e1c39f87ae73b0f0e020dd157971	?
 html4/top-offset-percentage-002.htm	7e9229eaf7ee749154c75c0d463bd03520c235f9	?
 xhtml1/top-offset-percentage-002.xht	7e9229eaf7ee749154c75c0d463bd03520c235f9	?
-html4/type-selector-001.htm	d3327ab4b3461c91afcd67cd74d82474215de578	?
-xhtml1/type-selector-001.xht	d3327ab4b3461c91afcd67cd74d82474215de578	?
+html4/type-selector-001.htm	58dfb53bd9b789f46a72572c5d7deed2964d4fff	?
+xhtml1/type-selector-001.xht	58dfb53bd9b789f46a72572c5d7deed2964d4fff	?
 html4/unicode-bidi-001.htm	23dd56a09e50c8f068ed78bfbec09343f4189224	?
 xhtml1/unicode-bidi-001.xht	23dd56a09e50c8f068ed78bfbec09343f4189224	?
 html4/unicode-bidi-002.htm	4b27955dff5183c9c707ec654c50ab0d5c9509f4	?
@@ -19663,16 +19661,16 @@ html4/units-008.htm	c0506c28ee0ee18f1de10bc47f78dc0d33406d92	?
 xhtml1/units-008.xht	c0506c28ee0ee18f1de10bc47f78dc0d33406d92	?
 html4/units-009.htm	ded56e72ffbcf5ccec4a9a229e5f6d4f1cc36aaa	?
 xhtml1/units-009.xht	ded56e72ffbcf5ccec4a9a229e5f6d4f1cc36aaa	?
-html4/universal-selector-001.htm	cc13774dd386fb3bab03ef9d43cc178c5d81be14	?
-xhtml1/universal-selector-001.xht	cc13774dd386fb3bab03ef9d43cc178c5d81be14	?
-html4/universal-selector-002.htm	1db3ed6ed5ace17db9cbf14504c175e9dd0cb33f	?
-xhtml1/universal-selector-002.xht	1db3ed6ed5ace17db9cbf14504c175e9dd0cb33f	?
+html4/universal-selector-001.htm	c3617ee8179a5ddf65d3039b16b36a2c81f22f2c	?
+xhtml1/universal-selector-001.xht	c3617ee8179a5ddf65d3039b16b36a2c81f22f2c	?
+html4/universal-selector-002.htm	5c316dbd1147b11c5b6d1e300c64c11f7996aaeb	?
+xhtml1/universal-selector-002.xht	5c316dbd1147b11c5b6d1e300c64c11f7996aaeb	?
 html4/universal-selector-003.htm	f7735be57f5127a3a29ad8c6bee15e2f43000257	?
 xhtml1/universal-selector-003.xht	f7735be57f5127a3a29ad8c6bee15e2f43000257	?
 html4/universal-selector-004.htm	bd7108e9b37a4a7ae047b325e84371676d8f59f8	?
 xhtml1/universal-selector-004.xht	bd7108e9b37a4a7ae047b325e84371676d8f59f8	?
-html4/universal-selector-005.htm	067a635d537f502875195eef1708a4dcff4da678	?
-xhtml1/universal-selector-005.xht	067a635d537f502875195eef1708a4dcff4da678	?
+html4/universal-selector-005.htm	c17084c2cb002eb80b6996bab5b625b015ce540d	?
+xhtml1/universal-selector-005.xht	c17084c2cb002eb80b6996bab5b625b015ce540d	?
 html4/unterminated-string-001.htm	0382eec4d581ec23a53d6eda52c957c826f5866e	?
 xhtml1/unterminated-string-001.xht	0382eec4d581ec23a53d6eda52c957c826f5866e	?
 html4/uri-001.htm	69b6499c2b5b5aea78312180be7647a2ea0c4253	?
diff --git a/tests/wpt/css-tests/css21_dev/testinfo.data b/tests/wpt/css-tests/css21_dev/testinfo.data
index ee519310794..bec62913e22 100644
--- a/tests/wpt/css-tests/css21_dev/testinfo.data
+++ b/tests/wpt/css-tests/css21_dev/testinfo.data
@@ -3948,13 +3948,13 @@ cascade-import-009		Cascade: Controlled delays with one alternate set		http://ww
 cascade-import-010		Cascade: Controlled delays with one alternate set (reversed)		http://www.w3.org/TR/html4/present/styles.html#h-14.3,http://www.w3.org/TR/CSS21/cascade.html#cascading-order	300dbd592f803a1f46a86c4b613a562ed305700a	`Ian Hickson`<mailto:ian@hixie.ch>	
 cascade-import-011		Cascade: Controlled delays with one alternate set (link and meta)		http://www.w3.org/TR/html4/present/styles.html#h-14.3,http://www.w3.org/TR/CSS21/cascade.html#cascading-order	5abf156afe2413731bc4ad87c9ddf62fb90cb4af	`Ian Hickson`<mailto:ian@hixie.ch>	
 cascade-import-012		Cascade: Controlled delays with one alternate set (link and meta; reversed)		http://www.w3.org/TR/html4/present/styles.html#h-14.3,http://www.w3.org/TR/CSS21/cascade.html#cascading-order	7b8edcaf0f14183657991fc67203cbdaae35569d	`Ian Hickson`<mailto:ian@hixie.ch>	
-cascade-import-dynamic-001	reference/ref-this-text-should-be-green	Dynamic sheet append (<style>)		http://www.w3.org/TR/CSS21/selector.html	5bab109174bd7f53a05c357a62c79834e97f7f98	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-002	reference/ref-this-text-should-be-green	Dynamic sheet append (<link>)		http://www.w3.org/TR/CSS21/selector.html	a7fb2e11c41fea1f5cfe203aece009c2d44d5068	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-003	reference/ref-this-text-should-be-green	Dynamic sheet insertion (<style>)		http://www.w3.org/TR/CSS21/selector.html	b3f396a6d930514adc8e910a51450340d40d8df1	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-004	reference/ref-this-text-should-be-green	Dynamic sheet insertion (<link>)		http://www.w3.org/TR/CSS21/selector.html	e6c67673851d064992b3f3b906e3f21e77a81c92	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-005	reference/ref-this-text-should-be-green	Dynamic sheet deletion (<style>)		http://www.w3.org/TR/CSS21/selector.html	9bfcea9503cd5802bd8a1fa7c07465d6a1fd2056	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-006	reference/ref-this-text-should-be-green	Dynamic sheet deletion (<link>)		http://www.w3.org/TR/CSS21/selector.html	37a809c867155025105254a40b1eb0fecba146c4	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-control	reference/ref-this-text-should-be-green	Control test		http://www.w3.org/TR/CSS21/selector.html	880148477f6b96ba980d9c3150f0dad41ca4ead1	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-001	reference/ref-this-text-should-be-green	Dynamic sheet append (<style>)		http://www.w3.org/TR/CSS21/selector.html	021270fcd44bf9ac8f2dbe1b7a8e287a880c66cb	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-002	reference/ref-this-text-should-be-green	Dynamic sheet append (<link>)		http://www.w3.org/TR/CSS21/selector.html	5dcbbb363284cbfd5e09d856f47cc1e791616bc9	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-003	reference/ref-this-text-should-be-green	Dynamic sheet insertion (<style>)		http://www.w3.org/TR/CSS21/selector.html	b4133f7b78f2aa9812ebbfa99ec9887d60077dda	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-004	reference/ref-this-text-should-be-green	Dynamic sheet insertion (<link>)		http://www.w3.org/TR/CSS21/selector.html	0391f275412b0e52cc5093c0cf7ef3253073693a	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-005	reference/ref-this-text-should-be-green	Dynamic sheet deletion (<style>)		http://www.w3.org/TR/CSS21/selector.html	4a60a35ba90e1fa996826fe89109646b94c6f00a	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-006	reference/ref-this-text-should-be-green	Dynamic sheet deletion (<link>)		http://www.w3.org/TR/CSS21/selector.html	feca2186ba10a6453aea329e984a433729a43c8c	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+cascade-import-dynamic-control	reference/ref-this-text-should-be-green	Control test		http://www.w3.org/TR/CSS21/selector.html	958a017819531dab335bab4da8c108d51335a699	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
 cascade-precedence-001		cascade mechanism has precedence over inheritance - font boldness		http://www.w3.org/TR/CSS21/cascade.html#specified-value,http://www.w3.org/TR/CSS21/cascade.html#inheritance	826330e8fb45187c92a17a871f14711bac0db58c	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>,`James Hopkins`<james(a)idreamincode.co.uk>	When determining the specified value of a property, the cascade mechanism of (user agent, author, user) style sheets has precedence. If no value results from such mechanism, then the property may inherit from its parent. In this testcase, it is presumed that b elements are specified in the user agents style sheets to embold their text content.
 cascade-precedence-002		cascade mechanism has precedence over inheritance - font styling		http://www.w3.org/TR/CSS21/cascade.html#specified-value,http://www.w3.org/TR/CSS21/cascade.html#inheritance	41e9c15a09904182939a51d5bae3c891486767e1	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>,`James Hopkins`<james(a)idreamincode.co.uk>	When determining the specified value of a property, the cascade mechanism of (user agent, author, user) style sheets has precedence. If no value results from such mechanism, then the property may inherit from its parent. In this testcase, it is presumed that i elements are specified in the user agents style sheets to italicize their text content.
 case-sensitive-000	reference/ref-green-background	Case-sensitivity of Properties and Keywords (background)		http://www.w3.org/TR/CSS21/syndata.html#characters	863f7b43b72216913382e79904453fa305c050ad	`L. David Baron`<http://dbaron.org/>	
@@ -4839,14 +4839,14 @@ delete-inline-in-blocks-middle-002	reference/delete-inline-in-blocks-middle-002-
 delete-inline-in-blocks-middle-003	reference/delete-inline-in-blocks-middle-002-ref	Delete an inline-level element inside a block whose children are otherwise all block-level, located in its middle	ahem,dom	http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level	2f696ce928cb3eabcae98ba31ef356eba2a416af	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	
 descendant-display-none-001	reference/ref-if-there-is-no-red	Descendant elements and 'display: none'		http://www.w3.org/TR/CSS21/visuren.html#propdef-display,http://www.w3.org/TR/CSS21/visuren.html#display-prop	ec97525599ffd2239e713c90a5c47745ed92aeea	`Microsoft`<http://www.microsoft.com/>	Descendant elements do not get generated when parent is 'display: none'.
 descendant-display-override-001	reference/ref-if-there-is-no-red	Overriding display none from parent		http://www.w3.org/TR/CSS21/visuren.html#propdef-display,http://www.w3.org/TR/CSS21/visuren.html#display-prop	8fee66e5f24c59663c0e11abf0be2d2ddd66a2cf	`Microsoft`<http://www.microsoft.com/>	Descendant elements cannot override the parent's setting of the 'display' property when set to 'none'.
-descendant-selector-000		Selectors: Descendant selectors		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	c106ca2b043e503ac9c245fe10c895aff0905c1d	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the descendant elements
-descendant-selector-001		Selectors: Descendant selectors and universal selector		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	e6cf0481f3fb02dbbadfe3d50da98453f2c2c4ee	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the descendant elements
+descendant-selector-000	reference/descendant-selector-000-ref	Selectors: Descendant selectors		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	46ec3dd542b4fe4875037ed280fbb5733cfe0e72	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the descendant elements
+descendant-selector-001	reference/descendant-selector-000-ref	Selectors: Descendant selectors and universal selector		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	e23a1b102570e81db35e762fb9d4e02969f9376c	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the descendant elements
 descendent-selector-001	reference/no-red-filler-text-ref	Descendent selector does not apply to parent element		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	11ab5da63b3f42ed71250c91136486e5b8a3c4cd	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied only to descendents.
-descendent-selector-002		Descendent selector		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	88cb1c03462749e54e1ec76a3b47cc8d7d4c9882	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied only to descendents.
-descendent-selector-003		Descendent selector with additional element between		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	8bf8e02dd855d18afae385e0d4d5fe0d1ac8d294	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied to descendents even if additional elements separate parent and subject of selector.
-descendent-selector-004		Descendent selector with incorrect parent element		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	73766503b0964b343d3f36cb4c645673b4a560e1	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied only to descendents where the parent element matches.
+descendent-selector-002	reference/descendent-selector-002-ref	Descendent selector		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	f23668f5490f18d28602ba3b9a6d07da85a5fbd9	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied only to descendents.
+descendent-selector-003	reference/descendent-selector-002-ref	Descendent selector with additional element between		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	90992c8275f86951529170b31be51271411b3782	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied to descendents even if additional elements separate parent and subject of selector.
+descendent-selector-004	reference/descendent-selector-004-ref	Descendent selector with incorrect parent element		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	81faee404c0c54087551e73a81e058832bfc97d3	`Microsoft`<http://www.microsoft.com/>	Descendent selectors are applied only to descendents where the parent element matches.
 descendent-selector-005	reference/no-red-filler-text-ref	Grandchild selection with no children		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	631da3319277f5ce15d01649a10ef2d8a044fa27	`Microsoft`<http://www.microsoft.com/>	Grandchild selection is applied only to elements which have grandchildren.
-descendent-selector-006		Grandchild selection with no grandchildren		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	33b12d03a89a2449d04aaf80331f6c67b05a9ca9	`Microsoft`<http://www.microsoft.com/>	Grandchild selection is applied only to elements which have grandchildren.
+descendent-selector-006	reference/descendent-selector-004-ref	Grandchild selection with no grandchildren		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	ffdeb0583f1d6f25d825bff85757715107f18b7d	`Microsoft`<http://www.microsoft.com/>	Grandchild selection is applied only to elements which have grandchildren.
 descendent-selector-007		Grandchild selection		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	9b3284e0cb3a8833f6a10c90716f9b6856caecbb	`Microsoft`<http://www.microsoft.com/>	Grandchild selection is applied only to elements which are grandchildren.
 descendent-selector-008		Descendent selector with ID attribute does not match elements without the ID attribute		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	19b5c529fefa7740ee50680d2587f5b0c0a28ac7	`Microsoft`<http://www.microsoft.com/>	Descendent selector with attribute applies only to applicable elements.
 descendent-selector-009		Descendent selector with ID attribute		http://www.w3.org/TR/CSS21/selector.html#descendant-selectors	415d77c4a17c0b71454887306265e45b749c96e3	`Microsoft`<http://www.microsoft.com/>	Descendent selector with attribute applies only to applicable elements.
@@ -6169,9 +6169,9 @@ grid-float-001	reference/ref-filled-green-100px-square	'float' has no effect on
 grid-inline-float-001	reference/ref-filled-green-100px-square	'float' has no effect on grid items within an inline grid		http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/CSS21/visuren.html#float-position	46b1d12be2ebe83b9d1f07d9bcd5c088a0db92dc	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-vertical-align-001	reference/ref-filled-green-100px-square	'vertical-align' has no effect on grid items within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align	e48c1cae6cb97ea4edd1f8aab243dcb996b821db	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-vertical-align-001	reference/ref-filled-green-100px-square	'vertical-align' has no effect on grid items	ahem	http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align	a1efe31bf3a51583086fefe427d94665c7c72322	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
-grouping-000		Selectors: Grouping		http://www.w3.org/TR/CSS21/selector.html#grouping	c14e7c69f1cd37a0426473096a5f8ac1b305b4f9	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply the rule to all elements grouped
-grouping-001		Selectors: Grouping: Invalid grouping	invalid	http://www.w3.org/TR/CSS21/selector.html#grouping	b3fac590ba2554a2264eb25f29bd4e50b7c7f393	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should ignore an invalid grouping
-grouping-002		Condensing selectors		http://www.w3.org/TR/CSS21/selector.html#grouping	0581de2b685acc087dfd6537d5b099fb27b3f74f	`Microsoft`<http://www.microsoft.com/>	Selectors can be condensed into a single selector.
+grouping-000	reference/grouping-000-ref,!reference/grouping-000-notref	Selectors: Grouping		http://www.w3.org/TR/CSS21/selector.html#grouping	62a41fd8b8a715aaf7ae70a4f00b0cc3af55c016	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply the rule to all elements grouped
+grouping-001	reference/grouping-000-ref,!reference/grouping-000-notref	Selectors: Grouping: Invalid grouping	invalid	http://www.w3.org/TR/CSS21/selector.html#grouping	a817c3fcfbf33e97186d8c2a7fa0b407498ad7a1	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should ignore an invalid grouping
+grouping-002	reference/grouping-002-ref,!reference/grouping-002-notref	Condensing selectors		http://www.w3.org/TR/CSS21/selector.html#grouping	5e80f38cbf9b8269c2fa23cd00c45ebd7aa71ed0	`Microsoft`<http://www.microsoft.com/>	Selectors can be condensed into a single selector.
 height-001	reference/height-001-ref	Height using pixels with a minimum minus one value, -1px	invalid	http://www.w3.org/TR/CSS21/visudet.html#propdef-height,http://www.w3.org/TR/CSS21/visudet.html#the-height-property	26b30109c8f8042237eefcc3dee1cd8c6e1ea932	`Microsoft`<http://www.microsoft.com/>	The 'height' property sets a minimum minus one length value in pixels is invalid and resets its value to 'auto'.
 height-002	reference/height-001-ref	Height using pixels with a minimum value, 0px		http://www.w3.org/TR/CSS21/visudet.html#propdef-height,http://www.w3.org/TR/CSS21/visudet.html#the-height-property	e3c7f7963d38e9e64ad7efff51e8bac7531341dd	`Microsoft`<http://www.microsoft.com/>	The 'height' property sets a minimum length value in pixels.
 height-003	reference/height-003-ref	Height using pixels with a minimum plus one value, 1px		http://www.w3.org/TR/CSS21/visudet.html#propdef-height,http://www.w3.org/TR/CSS21/visudet.html#the-height-property	a0481635b4b0054621ea45417721969c5f6ec70a	`Microsoft`<http://www.microsoft.com/>	The 'height' property sets a minimum plus one length value in pixels.
@@ -6376,9 +6376,8 @@ inline-block-alignment-003	reference/inline-block-alignment-003-ref	inline-block
 inline-block-alignment-004	reference/inline-block-alignment-002-ref	inline-block alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	f254f9b4e72bd5cfdff0411c9ed832c0d7c437ef	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 inline-block-alignment-005	reference/inline-block-alignment-003-ref	inline-block alignment - central alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	f22e9acf9997492e59bf06af71f147cf3a7ef60b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'upright', then the central baseline is used as the dominant baseline.
 inline-block-alignment-006	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	d331ddb7afc3bbe931b343cfec50b6f142a10f55	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
-inline-block-alignment-007	reference/inline-block-alignment-007-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	fa0c4bd5f60c840d6f8689ea4c9838e7534dbd11	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
+inline-block-alignment-007	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	6a9ee7d303ff1d49a6841edfb93f3abe04297ec7	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.
 inline-block-alignment-008	reference/inline-block-alignment-006-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	0c74b7bbf813193c08885b3d85823e5a2b4fb435	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
-inline-block-alignment-009	reference/inline-block-alignment-009-ref	inline block alignment - alphabetical alignment with vertical layout	ahem	http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines,http://www.w3.org/TR/CSS21/visuren.html#inline-boxes	011236f198ba8944faf000a6768995116784c55f	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.
 inline-block-height-001	reference/inline-block-height-001-ref	Test for height:auto on inline-block		http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height	16420343ff1b3e203ff5c995965add545595a9a6	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	
 inline-block-height-002	reference/inline-block-height-002-ref	Test for height:<length> on inline-block		http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height	13f6f7d3e9b65cb978c256d0f064517e544579c9	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	
 inline-block-non-replaced-height-001	reference/height-percentage-001-ref	Inline-block non-replaced element with 'margin-top', margin-bottom' set to 'auto' and 'height' relying on the descendants		http://www.w3.org/TR/CSS21/visudet.html#block-root-margin	3df4a8af7efd3439cc337a14a533ccb6df6a0578	`Microsoft`<http://www.microsoft.com/>	If 'height' is 'auto' on an inline-block non-replaced element then the 'height' depends on the descendants.
@@ -6622,7 +6621,7 @@ left-offset-002	reference/left-offset-001-ref	Position 'left' offset property -
 left-offset-003	reference/left-offset-003-ref	'left' property defines the offset from the left edge of the containing block		http://www.w3.org/TR/CSS21/visuren.html#propdef-right,http://www.w3.org/TR/CSS21/visuren.html#position-props	9ca8f526c6249cff2b268700f37f4a2a9c753d26	`Microsoft`<http://www.microsoft.com/>	The 'left' property, for absolute positioning, specifies the offset of the element in relation to the containing block's left edge. In this test, the containing block of the absolutely positioned element is formed by the padding box of its nearest (closest) non-inline positioned ancestor element.
 left-offset-percentage-001	reference/left-offset-percentage-001-ref	Left offset using percentage		http://www.w3.org/TR/CSS21/visuren.html#propdef-left,http://www.w3.org/TR/CSS21/visuren.html#position-props	2b1a8a647bc4659bb3ad604e611c62866bf83b37	`Microsoft`<http://www.microsoft.com/>	Percentage offset values for the 'left' property are based off the width of the containing block.
 left-offset-percentage-002	reference/left-offset-percentage-002-ref	position absolute - left offset percentage and inherit		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit,http://www.w3.org/TR/CSS21/visuren.html#position-props	b01fa2a64b07ebb97c6b2aa6a4fde5c360545cec	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	'left: inherit' makes the left property take the same computed value as the left property for the element's parent; in the case of a percentage value, the computed value is the specified percentage value. 'left: [percentage]' refers to width of containing block.
-left-offset-position-fixed-001	reference/left-offset-position-fixed-001-ref	left:auto offset of position:fixed box in a position:relative containing block		http://www.w3.org/TR/CSS21/visuren.html#position-props,http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width,https://drafts.csswg.org/css2/visuren.html#position-props,https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width	ccdc4e630469a14bae852ca5ade5cfe442d6ac16	`Chris Rebert`<http://chrisrebert.com>	The 'left' box offset property, for fixed positioning, when set to 'auto' specifies the offset of the box from its 'static-position containing block'. Here, in this test, the 'static-position containing block' is #shifted-column and the containing block for #red is established by the viewport.
+left-offset-position-fixed-001	reference/left-offset-position-fixed-001-ref	left:auto offset of position:fixed box in a position:relative containing block		http://www.w3.org/TR/CSS21/visuren.html#position-props,http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width,https://drafts.csswg.org/css2/visuren.html#position-props,https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width	ef00d8c4e4949be47753fac480c33302bec380c0	`Chris Rebert`<http://chrisrebert.com>	The 'left' box offset property, for fixed positioning, when set to 'auto' specifies the offset of the box from its 'static-position containing block'. Here, in this test, the 'static-position containing block' is #shifted-column and the containing block for #red is established by the viewport.
 letter-spacing-004		Letter-spacing using pixels with a negative zero value, -0px	ahem	http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing,http://www.w3.org/TR/CSS21/text.html#spacing-props	35a1c7eb6a26207ef41c2a9a57418b8ba9c17bba	`Microsoft`<http://www.microsoft.com/>	The 'letter-spacing' property sets a negative zero length value in pixels.
 letter-spacing-005		Letter-spacing using pixels with a zero value, 0px	ahem	http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing,http://www.w3.org/TR/CSS21/text.html#spacing-props	b41f3e19526acd39a3df86c8c1ba9930f86251dd	`Microsoft`<http://www.microsoft.com/>	The 'letter-spacing' property sets a zero length value in pixels.
 letter-spacing-006		Letter-spacing using pixels with a positive zero value, +0px	ahem	http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing,http://www.w3.org/TR/CSS21/text.html#spacing-props	a41c9f8b0148bf6d4a74cd7d4d0fa58691b8dd65	`Microsoft`<http://www.microsoft.com/>	The 'letter-spacing' property sets a positive zero length value in pixels.
@@ -9047,8 +9046,8 @@ strings-000	reference/ref-this-text-should-be-green	Newlines in strings		http://
 style-attr-cascade-001	reference/ref-green	CSS: style attributes vs. important tag selector		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	9ea5fe841cee012c60f48a36f301ef4554767c4b	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-002	reference/ref-green	CSS: style attribute (normal vs. important)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/css-style-attr/#interpret	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-003	reference/ref-green	CSS: style attribute vs. tag selector		http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	17ce428ad2e965f4f3fc07558f21c2f3ff71d9ae	`Ian Hickson`<mailto:ian@hixie.ch>	
-style-attr-cascade-004	reference/ref-green-background	CSS: style attribute vs. important tag selectors		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	73eb0f1e393638bcd4b65f97d840c6a30a722dc4	`Ian Hickson`<mailto:ian@hixie.ch>	
-style-attr-cascade-005	reference/ref-green-background	CSS: style attribute vs. tag selectors (interleaved importance)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	29da953d3c353f6f18e4dbdae63638d354c73df2	`Ian Hickson`<mailto:ian@hixie.ch>	
+style-attr-cascade-004	reference/ref-white-on-green-background	CSS: style attribute vs. important tag selectors		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	002bed21e9e44e603e6c8431853eb0fd8c636dad	`Ian Hickson`<mailto:ian@hixie.ch>	
+style-attr-cascade-005	reference/ref-white-on-green-background	CSS: style attribute vs. tag selectors (interleaved importance)		http://www.w3.org/TR/CSS21/cascade.html#important-rules,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	72e8f4b20c569e6bb4c3634639719332bc70a223	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-006	reference/ref-green	CSS: style attribute and 'inherit'		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit,http://www.w3.org/TR/CSS21/cascade.html#cascading-order,http://www.w3.org/TR/css-style-attr/#interpret	5f31a718bbe6eedd436062d4e68e5878b74aa581	`Ian Hickson`<mailto:ian@hixie.ch>	
 style-attr-cascade-007	reference/style-attr-cascade-007	Style Attribute Inheritance	image	http://www.w3.org/TR/CSS21/cascade.html#inheritance,http://www.w3.org/TR/css-style-attr/#interpret	d59eaebdf15f153ab8c1016e07344df3bed2dbd2	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Iff a property inherits, it also inherits when declared via style attribute.
 style-attr-specificity-001	reference/ref-green-on-green	Style attribute and specificity of selectors		http://www.w3.org/TR/css-style-attr/#interpret,http://www.w3.org/TR/CSS21/cascade.html#specificity	ff304694f5444dd8bbe043ceb52447cea2ec2cee	`Microsoft`<http://www.microsoft.com/>	The style attribute has a higher specificity than any other selector.
@@ -9845,7 +9844,7 @@ top-offset-002	reference/bottom-offset-001-ref	Position 'top' offset property -
 top-offset-003	reference/top-offset-003-ref	Position 'top' property defines the offset from the top edge of the containing block		http://www.w3.org/TR/CSS21/visuren.html#propdef-top,http://www.w3.org/TR/CSS21/visuren.html#position-props	3d734bc560732e19589445a3e61775d71527d349	`Microsoft`<http://www.microsoft.com/>	The 'top' property, for absolute positioning, specifies the offset of the element in relation to the containing block's top edge. The containing block of an absolutely positioned element is formed by the padding box of its nearest (closest) positioned ancestor element.
 top-offset-percentage-001	reference/top-offset-percentage-001-ref	Top offset using percentage		http://www.w3.org/TR/CSS21/visuren.html#propdef-top,http://www.w3.org/TR/CSS21/visuren.html#position-props	919fa6e32b97e1c39f87ae73b0f0e020dd157971	`Microsoft`<http://www.microsoft.com/>	Percentage offset values for the 'top' property are based off the height of the containing block.
 top-offset-percentage-002	reference/left-offset-percentage-002-ref	position absolute - top offset percentage and inherit		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit,http://www.w3.org/TR/CSS21/visuren.html#position-props	7e9229eaf7ee749154c75c0d463bd03520c235f9	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	'top: inherit' makes the top property take the same computed value as the top property for the element's parent; in the case of a percentage value, the computed value is the specified percentage value. 'top: [percentage]' refers to height of containing block.
-type-selector-001		Type selectors		http://www.w3.org/TR/CSS21/selector.html#type-selectors	d3327ab4b3461c91afcd67cd74d82474215de578	`Microsoft`<http://www.microsoft.com/>	Basic type selectors apply to each type.
+type-selector-001	reference/type-selector-001-ref	Type selectors		http://www.w3.org/TR/CSS21/selector.html#type-selectors	58dfb53bd9b789f46a72572c5d7deed2964d4fff	`Microsoft`<http://www.microsoft.com/>	Basic type selectors apply to each type.
 unicode-bidi-001	reference/direction-002-ref	Unicode-bidi set to 'normal'		http://www.w3.org/TR/css-writing-modes-3/#unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#propdef-unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#direction	23dd56a09e50c8f068ed78bfbec09343f4189224	`Microsoft`<http://www.microsoft.com/>	The property 'unicode-bidi' set to 'normal' doesn't modify the directionality of text.
 unicode-bidi-002	reference/unicode-bidi-002-ref	Unicode-bidi set to 'embed'		http://www.w3.org/TR/css-writing-modes-3/#unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#propdef-unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#direction	4b27955dff5183c9c707ec654c50ab0d5c9509f4	`Microsoft`<http://www.microsoft.com/>	The property 'unicode-bidi' set to 'embed' opens a new level of embedding in the Unicode bi-directional algorithm.
 unicode-bidi-003	reference/direction-002-ref	Unicode-bidi set to 'bidi-override'		http://www.w3.org/TR/css-writing-modes-3/#unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#propdef-unicode-bidi,http://www.w3.org/TR/CSS21/visuren.html#direction	6b6e2d5a6826f07407b45cc0c1f26cfb111c730a	`Microsoft`<http://www.microsoft.com/>	The property 'unicode-bidi' set to 'bidi-override' overrides the directionality of text.
@@ -9873,11 +9872,11 @@ units-005	reference/units-005-ref	Units: em (0.87em floats)		http://www.w3.org/T
 units-006	reference/units-006-ref	Units: px and font-size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	5819af2a4624efaa28aec5fde72fef0f6fba0015	`Ian Hickson`<mailto:ian@hixie.ch>	
 units-008	reference/units-006-ref	Units: px and inherited font-size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	c0506c28ee0ee18f1de10bc47f78dc0d33406d92	`Ian Hickson`<mailto:ian@hixie.ch>	
 units-009	reference/units-006-ref	Units: px and dependent font-size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	ded56e72ffbcf5ccec4a9a229e5f6d4f1cc36aaa	`Ian Hickson`<mailto:ian@hixie.ch>	
-universal-selector-001		Universal selector		http://www.w3.org/TR/CSS21/selector.html#universal-selector	cc13774dd386fb3bab03ef9d43cc178c5d81be14	`Microsoft`<http://www.microsoft.com/>	The universal selector applies to all elements.
-universal-selector-002		Implied universal selector for pseudo selector		http://www.w3.org/TR/CSS21/selector.html#universal-selector	1db3ed6ed5ace17db9cbf14504c175e9dd0cb33f	`Microsoft`<http://www.microsoft.com/>	If the universal selector is not the only component of a simple pseudo selector the '*' can be omitted.
+universal-selector-001	reference/universal-selector-001-ref,!reference/universal-selector-001-notref	Universal selector		http://www.w3.org/TR/CSS21/selector.html#universal-selector	c3617ee8179a5ddf65d3039b16b36a2c81f22f2c	`Microsoft`<http://www.microsoft.com/>	The universal selector applies to all elements.
+universal-selector-002	reference/universal-selector-002-ref,!reference/universal-selector-002-notref	Implied universal selector for pseudo selector		http://www.w3.org/TR/CSS21/selector.html#universal-selector	5c316dbd1147b11c5b6d1e300c64c11f7996aaeb	`Microsoft`<http://www.microsoft.com/>	If the universal selector is not the only component of a simple pseudo selector the '*' can be omitted.
 universal-selector-003	reference/filler-text-below-green	Implied universal selector for class selector		http://www.w3.org/TR/CSS21/selector.html#universal-selector	f7735be57f5127a3a29ad8c6bee15e2f43000257	`Microsoft`<http://www.microsoft.com/>	If the universal selector is not the only component of a simple class selector the * can be omitted.
 universal-selector-004	reference/filler-text-below-green	Implied universal selector for ID		http://www.w3.org/TR/CSS21/selector.html#universal-selector	bd7108e9b37a4a7ae047b325e84371676d8f59f8	`Microsoft`<http://www.microsoft.com/>	If the universal selector is not the only component of a simple id selector the * can be omitted.
-universal-selector-005		universal selector - list-style-image	image	http://www.w3.org/TR/CSS21/selector.html#universal-selector,http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image	067a635d537f502875195eef1708a4dcff4da678	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>,`James Hopkins`<james(a)idreamincode.co.uk>,`Mark McKenzie-Bell`<info(a)temerity.co.uk>,`Alexander Dawson`<alexander_dawson(a)hotmail.com>	The universal selector matches the name of any element type. 'list-style-image' applies to elements with 'display: list-item'.
+universal-selector-005	reference/universal-selector-005-ref	universal selector - list-style-image	image	http://www.w3.org/TR/CSS21/selector.html#universal-selector,http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image	c17084c2cb002eb80b6996bab5b625b015ce540d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>,`James Hopkins`<james(a)idreamincode.co.uk>,`Mark McKenzie-Bell`<info(a)temerity.co.uk>,`Alexander Dawson`<alexander_dawson(a)hotmail.com>	The universal selector matches the name of any element type. 'list-style-image' applies to elements with 'display: list-item'.
 unterminated-string-001	reference/filler-text-below-green	Error handling of unterminated strings	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	0382eec4d581ec23a53d6eda52c957c826f5866e	`Microsoft`<http://www.microsoft.com/>	When the parser encounters an unterminated string, the parser drops everything up to the next ';'.
 uri-001	reference/filler-text-below-green	Parsing valid URIs with white space and no quotes		http://www.w3.org/TR/CSS21/syndata.html#uri	69b6499c2b5b5aea78312180be7647a2ea0c4253	`Microsoft`<http://www.microsoft.com/>	A url function is valid if it is 'url(', followed by the URI, followed by ')', even with white space between.
 uri-002	reference/no-red-filler-text-ref	Parsing URL with an invalid space	invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	b8f3777c50d2e318dc49c93c6e1ce0a39826ead1	`Microsoft`<http://www.microsoft.com/>	URL functions with invalid spaces are ignored.
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht
index b9312add45a..7ba6e8c1344 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht
@@ -11446,7 +11446,7 @@
       <tr id="universal-selector-005-12.5.1.#propdef-list-style-image" class="image">
         <td>
             <a href="universal-selector-005.xht">universal-selector-005</a></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
index af5e87325df..9ed823a7ade 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
@@ -159,7 +159,7 @@
       <tr id="grouping-000-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-000.xht">grouping-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Selectors: Grouping
           <ul class="assert">
@@ -170,7 +170,7 @@
       <tr id="grouping-001-5.2.1" class="primary invalid">
         <td><strong>
             <a href="grouping-001.xht">grouping-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Selectors: Grouping: Invalid grouping
           <ul class="assert">
@@ -181,7 +181,7 @@
       <tr id="grouping-002-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-002.xht">grouping-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-002-ref.xht">=</a> <a href="reference/grouping-002-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Condensing selectors
           <ul class="assert">
@@ -204,7 +204,7 @@
       <tr id="universal-selector-001-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-001.xht">universal-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-001-ref.xht">=</a> <a href="reference/universal-selector-001-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Universal selector
           <ul class="assert">
@@ -215,7 +215,7 @@
       <tr id="universal-selector-002-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-002.xht">universal-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-002-ref.xht">=</a> <a href="reference/universal-selector-002-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Implied universal selector for pseudo selector
           <ul class="assert">
@@ -248,7 +248,7 @@
       <tr id="universal-selector-005-5.3" class="primary image">
         <td><strong>
             <a href="universal-selector-005.xht">universal-selector-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
@@ -276,7 +276,7 @@
       <tr id="type-selector-001-5.4" class="primary">
         <td><strong>
             <a href="type-selector-001.xht">type-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/type-selector-001-ref.xht">=</a> </td>
         <td></td>
         <td>Type selectors
           <ul class="assert">
@@ -320,7 +320,7 @@
       <tr id="descendant-selector-000-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-000.xht">descendant-selector-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors
           <ul class="assert">
@@ -331,7 +331,7 @@
       <tr id="descendant-selector-001-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-001.xht">descendant-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors and universal selector
           <ul class="assert">
@@ -353,7 +353,7 @@
       <tr id="descendent-selector-002-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-002.xht">descendent-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector
           <ul class="assert">
@@ -364,7 +364,7 @@
       <tr id="descendent-selector-003-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-003.xht">descendent-selector-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector with additional element between
           <ul class="assert">
@@ -375,7 +375,7 @@
       <tr id="descendent-selector-004-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-004.xht">descendent-selector-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector with incorrect parent element
           <ul class="assert">
@@ -397,7 +397,7 @@
       <tr id="descendent-selector-006-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-006.xht">descendent-selector-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
         <td></td>
         <td>Grandchild selection with no grandchildren
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-6.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-6.xht
index 62b16481622..87dc10fd1c6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-6.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-6.xht
@@ -1102,7 +1102,7 @@
       <tr id="style-attr-cascade-004-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1110,7 +1110,7 @@
       <tr id="style-attr-cascade-005-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
@@ -1222,7 +1222,7 @@
       <tr id="style-attr-cascade-004-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></strong></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1230,7 +1230,7 @@
       <tr id="style-attr-cascade-005-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></strong></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht
index 94ac484d674..06511988a70 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model (1246 tests)</h2>
+  <h2>Visual formatting model (1245 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1338,7 +1338,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.2.2">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">9.2.2 Inline-level elements and inline boxes</a></th></tr>
-      <!-- 20 tests -->
+      <!-- 19 tests -->
       <tr id="inline-block-alignment-002-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-002.xht">inline-block-alignment-002</a></td>
@@ -1397,7 +1397,7 @@
       <tr id="inline-block-alignment-007-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -1416,17 +1416,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-9.2.2" class="ahem">
-        <td>
-            <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inlines-002-9.2.2" class="primary">
         <td><strong>
             <a href="inlines-002.xht">inlines-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-000.xht
index b1311022391..b5727c63175 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Selectors: Descendant selectors</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors"/>
+  <link rel="match" href="reference/descendant-selector-000-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply each rule to the descendant elements"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-001.xht
index 89215ee0162..30f5df7b2fa 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendant-selector-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Selectors: Descendant selectors and universal selector</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors"/>
+  <link rel="match" href="reference/descendant-selector-000-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply each rule to the descendant elements"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-002.xht
index 77414387302..7312012bd50 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-002.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied only to descendents." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-003.xht
index 7389f9fd1b7..02c682fd56d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-003.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector with additional element between</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied to descendents even if additional elements separate parent and subject of selector." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-004.xht
index 674f01e60b8..e52fd362f55 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Descendent selector with incorrect parent element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied only to descendents where the parent element matches." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-006.xht
index c4895efa6df..cbb1e22b3a9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-006.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Grandchild selection with no grandchildren</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Grandchild selection is applied only to elements which have grandchildren." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-000.xht
index 497d54a067e..b68ce75b82f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-000.xht
@@ -4,6 +4,8 @@
   <title>CSS Test: Selectors: Grouping</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping"/>
+  <link rel="match" href="reference/grouping-000-ref.xht"/>
+  <link rel="mismatch" href="reference/grouping-000-notref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply the rule to all elements grouped"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-001.xht
index 244e882297d..182b5d544b3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-001.xht
@@ -4,6 +4,8 @@
   <title>CSS Test: Selectors: Grouping: Invalid grouping</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping"/>
+  <link rel="match" href="reference/grouping-000-ref.xht"/>
+  <link rel="mismatch" href="reference/grouping-000-notref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Browsers should ignore an invalid grouping"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-002.xht
index d79047a9d91..1b37d160ec4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/grouping-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/grouping-002.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Condensing selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping" />
+        <link rel="match" href="reference/grouping-002-ref.xht" />
+        <link rel="mismatch" href="reference/grouping-002-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Selectors can be condensed into a single selector." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht
index c62a3102cab..f84a27c247d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht
@@ -3,16 +3,15 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-007-ref.xht" />
+    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -50,7 +49,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-009.xht
deleted file mode 100644
index 415bf31786c..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-009.xht
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-009-ref.xht" />
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/left-offset-position-fixed-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/left-offset-position-fixed-001.xht
index 00f41b83870..d50259b9f2f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/left-offset-position-fixed-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/left-offset-position-fixed-001.xht
@@ -3,7 +3,7 @@
   <head>
     <title>CSS Test: left:auto offset of position:fixed box in a position:relative containing block</title>
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com"/>
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>  <!-- 2015-09-17 -->
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#position-props" title="9.3.2 Box offsets: 'top', 'right', 'bottom', 'left'"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements"/>
     <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#position-props"/>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht
new file mode 100644
index 00000000000..a8a8c939224
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.orange {
+  border: thin solid orange;
+}
+.blue {
+  border: thin solid blue;
+}
+.fuchsia {
+  border: thin solid fuchsia;
+}
+</style>
+</head>
+<body>
+<p class="orange">This paragraph should have a thin orange border.</p>
+<div><p class="blue">This paragraph should have a thin blue border.</p></div>
+<h4><span class="fuchsia">This text should have a thin fuchsia border.</span></h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht
new file mode 100644
index 00000000000..fc9f7aae37c
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht
new file mode 100644
index 00000000000..7e2ac2b685e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if there is no red visible on the page.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-notref.xht
new file mode 100644
index 00000000000..c074843b269
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-notref.xht
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-ref.xht
new file mode 100644
index 00000000000..a70e7921d5e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-000-ref.xht
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+  font-weight: bold;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-notref.xht
new file mode 100644
index 00000000000..d0d10881abf
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-notref.xht
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-ref.xht
new file mode 100644
index 00000000000..8e3e092054f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/grouping-002-ref.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+blockquote {
+  color: green;
+}
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
deleted file mode 100644
index af276765500..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
deleted file mode 100644
index 750090cd261..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-green-background.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-green-background.xht
index 0129c4c596a..e6f8ab69b8d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-green-background.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-green-background.xht
@@ -1,11 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Reference</title>
-<link href="http://www.intel.com" rel="author" title="Intel" />
-<style>
-  div { background-color: green; color: white; }
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: white;
+  background: green;
+}
 </style>
-</head><body>
-  <div>This should be white on green.</div>
-
-</body></html>
\ No newline at end of file
+</head>
+<body>
+<p>This should have a green background.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-white-on-green-background.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-white-on-green-background.xht
new file mode 100644
index 00000000000..0129c4c596a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ref-white-on-green-background.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+<style>
+  div { background-color: green; color: white; }
+</style>
+</head><body>
+  <div>This should be white on green.</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/type-selector-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/type-selector-001-ref.xht
new file mode 100644
index 00000000000..2d29fb51980
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/type-selector-001-ref.xht
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.green {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote class="green">Filler Text</blockquote>
+<div class="green">Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-notref.xht
new file mode 100644
index 00000000000..caa7c70f8df
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-notref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-ref.xht
new file mode 100644
index 00000000000..10bbd5e37b9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-001-ref.xht
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-notref.xht
new file mode 100644
index 00000000000..e9c143e7894
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-notref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-ref.xht
new file mode 100644
index 00000000000..d1bffa46680
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-002-ref.xht
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-005-ref.xht
new file mode 100644
index 00000000000..019cac20af7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/universal-selector-005-ref.xht
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  margin-left: 100px;
+}
+li {
+  list-style-image: url("support/cat.png");
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a <strong>cat image</strong>.</p>
+<ul>
+  <li>&nbsp;</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
index d55178a4e65..f875917afe3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
@@ -24172,6 +24172,22 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendant-selector-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors">
+          <a href="descendant-selector-000.xht">descendant-selector-000</a></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendant-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors and universal selector">
+          <a href="descendant-selector-001.xht">descendant-selector-001</a></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-001" class="">
       <tr>
         <td rowspan="1" title="Descendent selector does not apply to parent element">
@@ -24180,6 +24196,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector">
+          <a href="descendent-selector-002.xht">descendent-selector-002</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-003" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with additional element between">
+          <a href="descendent-selector-003.xht">descendent-selector-003</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-004" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with incorrect parent element">
+          <a href="descendent-selector-004.xht">descendent-selector-004</a></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-005" class="">
       <tr>
         <td rowspan="1" title="Grandchild selection with no children">
@@ -24188,6 +24228,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-006" class="">
+      <tr>
+        <td rowspan="1" title="Grandchild selection with no grandchildren">
+          <a href="descendent-selector-006.xht">descendent-selector-006</a></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="direction-001" class="">
       <tr>
         <td rowspan="1" title="Direction set to 'ltr'">
@@ -28188,6 +28236,30 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="grouping-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping">
+          <a href="grouping-000.xht">grouping-000</a></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping: Invalid grouping">
+          <a href="grouping-001.xht">grouping-001</a></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-002" class="">
+      <tr>
+        <td rowspan="1" title="Condensing selectors">
+          <a href="grouping-002.xht">grouping-002</a></td>
+        <td><a href="reference/grouping-002-ref.xht">=</a> <a href="reference/grouping-002-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Height using pixels with a minimum minus one value, -1px">
@@ -29376,7 +29448,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -29388,14 +29460,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-height-001" class="">
       <tr>
         <td rowspan="1" title="Test for height:auto on inline-block">
@@ -43835,7 +43899,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -43843,7 +43907,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -44935,6 +44999,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="type-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Type selectors">
+          <a href="type-selector-001.xht">type-selector-001</a></td>
+        <td><a href="reference/type-selector-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="unicode-bidi-001" class="">
       <tr>
         <td rowspan="1" title="Unicode-bidi set to 'normal'">
@@ -45135,6 +45207,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Universal selector">
+          <a href="universal-selector-001.xht">universal-selector-001</a></td>
+        <td><a href="reference/universal-selector-001-ref.xht">=</a> <a href="reference/universal-selector-001-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="universal-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Implied universal selector for pseudo selector">
+          <a href="universal-selector-002.xht">universal-selector-002</a></td>
+        <td><a href="reference/universal-selector-002-ref.xht">=</a> <a href="reference/universal-selector-002-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="universal-selector-003" class="">
       <tr>
         <td rowspan="1" title="Implied universal selector for class selector">
@@ -45151,6 +45239,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-005" class="image">
+      <tr>
+        <td rowspan="1" title="universal selector - list-style-image">
+          <a href="universal-selector-005.xht">universal-selector-005</a></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="unterminated-string-001" class="invalid">
       <tr>
         <td rowspan="1" title="Error handling of unterminated strings">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
index 9da679f3f17..1b1534f1a45 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
@@ -3028,8 +3028,14 @@ delete-inline-in-blocks-middle-002.xht == reference/delete-inline-in-blocks-midd
 delete-inline-in-blocks-middle-003.xht == reference/delete-inline-in-blocks-middle-002-ref.xht
 descendant-display-none-001.xht == reference/ref-if-there-is-no-red.xht
 descendant-display-override-001.xht == reference/ref-if-there-is-no-red.xht
+descendant-selector-000.xht == reference/descendant-selector-000-ref.xht
+descendant-selector-001.xht == reference/descendant-selector-000-ref.xht
 descendent-selector-001.xht == reference/no-red-filler-text-ref.xht
+descendent-selector-002.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-003.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-004.xht == reference/descendent-selector-004-ref.xht
 descendent-selector-005.xht == reference/no-red-filler-text-ref.xht
+descendent-selector-006.xht == reference/descendent-selector-004-ref.xht
 direction-001.xht == reference/direction-001-ref.xht
 direction-002.xht == reference/direction-002-ref.xht
 direction-003.xht == reference/direction-002-ref.xht
@@ -3530,6 +3536,9 @@ grid-float-001.xht == reference/ref-filled-green-100px-square.xht
 grid-inline-float-001.xht == reference/ref-filled-green-100px-square.xht
 grid-inline-vertical-align-001.xht == reference/ref-filled-green-100px-square.xht
 grid-vertical-align-001.xht == reference/ref-filled-green-100px-square.xht
+grouping-000.xht == reference/grouping-000-ref.xht != reference/grouping-000-notref.xht
+grouping-001.xht == reference/grouping-000-ref.xht != reference/grouping-000-notref.xht
+grouping-002.xht == reference/grouping-002-ref.xht != reference/grouping-002-notref.xht
 height-001.xht == reference/height-001-ref.xht
 height-002.xht == reference/height-001-ref.xht
 height-003.xht == reference/height-003-ref.xht
@@ -3679,9 +3688,8 @@ inline-block-alignment-003.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht
 inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-007.xht == reference/inline-block-alignment-007-ref.xht
+inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-009.xht == reference/inline-block-alignment-009-ref.xht
 inline-block-height-001.xht == reference/inline-block-height-001-ref.xht
 inline-block-height-002.xht == reference/inline-block-height-002-ref.xht
 inline-block-non-replaced-height-001.xht == reference/height-percentage-001-ref.xht
@@ -5488,8 +5496,8 @@ strings-000.xht == reference/ref-this-text-should-be-green.xht
 style-attr-cascade-001.xht == reference/ref-green.xht
 style-attr-cascade-002.xht == reference/ref-green.xht
 style-attr-cascade-003.xht == reference/ref-green.xht
-style-attr-cascade-004.xht == reference/ref-green-background.xht
-style-attr-cascade-005.xht == reference/ref-green-background.xht
+style-attr-cascade-004.xht == reference/ref-white-on-green-background.xht
+style-attr-cascade-005.xht == reference/ref-white-on-green-background.xht
 style-attr-cascade-006.xht == reference/ref-green.xht
 style-attr-cascade-007.xht == reference/style-attr-cascade-007.xht
 style-attr-specificity-001.xht == reference/ref-green-on-green.xht
@@ -5626,6 +5634,7 @@ top-offset-002.xht == reference/bottom-offset-001-ref.xht
 top-offset-003.xht == reference/top-offset-003-ref.xht
 top-offset-percentage-001.xht == reference/top-offset-percentage-001-ref.xht
 top-offset-percentage-002.xht == reference/left-offset-percentage-002-ref.xht
+type-selector-001.xht == reference/type-selector-001-ref.xht
 unicode-bidi-001.xht == reference/direction-002-ref.xht
 unicode-bidi-002.xht == reference/unicode-bidi-002-ref.xht
 unicode-bidi-003.xht == reference/direction-002-ref.xht
@@ -5651,8 +5660,11 @@ units-005.xht == reference/units-005-ref.xht
 units-006.xht == reference/units-006-ref.xht
 units-008.xht == reference/units-006-ref.xht
 units-009.xht == reference/units-006-ref.xht
+universal-selector-001.xht == reference/universal-selector-001-ref.xht != reference/universal-selector-001-notref.xht
+universal-selector-002.xht == reference/universal-selector-002-ref.xht != reference/universal-selector-002-notref.xht
 universal-selector-003.xht == reference/filler-text-below-green.xht
 universal-selector-004.xht == reference/filler-text-below-green.xht
+universal-selector-005.xht == reference/universal-selector-005-ref.xht
 unterminated-string-001.xht == reference/filler-text-below-green.xht
 uri-001.xht == reference/filler-text-below-green.xht
 uri-002.xht == reference/no-red-filler-text-ref.xht
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-004.xht
index 316d0cacc9d..73f3f209a37 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-004.xht
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-005.xht
index 14093ba88bf..395472ddd82 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/style-attr-cascade-005.xht
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
index 973e73cf8b3..57bbd468bfc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
@@ -62,7 +62,7 @@
     <tbody id="s9">
       <tr><th><a href="chapter-9.xht">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1246 Tests)</td></tr>
+      <td>(1245 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.xht">Chapter 10 - 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/type-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/type-selector-001.xht
index 4478998709b..46519445198 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/type-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/type-selector-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Type selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#type-selectors" />
+        <link rel="match" href="reference/type-selector-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Basic type selectors apply to each type." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-001.xht
index 67e44bff284..6c6d5ad1b56 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-001.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Universal selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
+        <link rel="match" href="reference/universal-selector-001-ref.xht" />
+        <link rel="mismatch" href="reference/universal-selector-001-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The universal selector applies to all elements." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-002.xht
index dde2352fd9c..3e4ac32f3af 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-002.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Implied universal selector for pseudo selector</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
+        <link rel="match" href="reference/universal-selector-002-ref.xht" />
+        <link rel="mismatch" href="reference/universal-selector-002-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="If the universal selector is not the only component of a simple pseudo selector the '*' can be omitted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-005.xht
index b7a4bb75f7c..c94ac8c1855 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/universal-selector-005.xht
@@ -11,6 +11,7 @@
   <link rel="author" title="Alexander Dawson" href="alexander_dawson(a)hotmail.com" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image" />
+  <link rel="match" href="reference/universal-selector-005-ref.xht" />
   <meta name="flags" content="image" />
   <meta name="assert" content="The universal selector matches the name of any element type. 'list-style-image' applies to elements with 'display: list-item'." />
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht
index b9312add45a..7ba6e8c1344 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht
@@ -11446,7 +11446,7 @@
       <tr id="universal-selector-005-12.5.1.#propdef-list-style-image" class="image">
         <td>
             <a href="universal-selector-005.xht">universal-selector-005</a></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
index af5e87325df..9ed823a7ade 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
@@ -159,7 +159,7 @@
       <tr id="grouping-000-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-000.xht">grouping-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Selectors: Grouping
           <ul class="assert">
@@ -170,7 +170,7 @@
       <tr id="grouping-001-5.2.1" class="primary invalid">
         <td><strong>
             <a href="grouping-001.xht">grouping-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Selectors: Grouping: Invalid grouping
           <ul class="assert">
@@ -181,7 +181,7 @@
       <tr id="grouping-002-5.2.1" class="primary">
         <td><strong>
             <a href="grouping-002.xht">grouping-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/grouping-002-ref.xht">=</a> <a href="reference/grouping-002-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Condensing selectors
           <ul class="assert">
@@ -204,7 +204,7 @@
       <tr id="universal-selector-001-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-001.xht">universal-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-001-ref.xht">=</a> <a href="reference/universal-selector-001-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Universal selector
           <ul class="assert">
@@ -215,7 +215,7 @@
       <tr id="universal-selector-002-5.3" class="primary">
         <td><strong>
             <a href="universal-selector-002.xht">universal-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-002-ref.xht">=</a> <a href="reference/universal-selector-002-notref.xht">&#x2260;</a> </td>
         <td></td>
         <td>Implied universal selector for pseudo selector
           <ul class="assert">
@@ -248,7 +248,7 @@
       <tr id="universal-selector-005-5.3" class="primary image">
         <td><strong>
             <a href="universal-selector-005.xht">universal-selector-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>universal selector - list-style-image
           <ul class="assert">
@@ -276,7 +276,7 @@
       <tr id="type-selector-001-5.4" class="primary">
         <td><strong>
             <a href="type-selector-001.xht">type-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/type-selector-001-ref.xht">=</a> </td>
         <td></td>
         <td>Type selectors
           <ul class="assert">
@@ -320,7 +320,7 @@
       <tr id="descendant-selector-000-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-000.xht">descendant-selector-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors
           <ul class="assert">
@@ -331,7 +331,7 @@
       <tr id="descendant-selector-001-5.5" class="primary">
         <td><strong>
             <a href="descendant-selector-001.xht">descendant-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
         <td></td>
         <td>Selectors: Descendant selectors and universal selector
           <ul class="assert">
@@ -353,7 +353,7 @@
       <tr id="descendent-selector-002-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-002.xht">descendent-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector
           <ul class="assert">
@@ -364,7 +364,7 @@
       <tr id="descendent-selector-003-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-003.xht">descendent-selector-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector with additional element between
           <ul class="assert">
@@ -375,7 +375,7 @@
       <tr id="descendent-selector-004-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-004.xht">descendent-selector-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
         <td></td>
         <td>Descendent selector with incorrect parent element
           <ul class="assert">
@@ -397,7 +397,7 @@
       <tr id="descendent-selector-006-5.5" class="primary">
         <td><strong>
             <a href="descendent-selector-006.xht">descendent-selector-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
         <td></td>
         <td>Grandchild selection with no grandchildren
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-6.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-6.xht
index 62b16481622..87dc10fd1c6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-6.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-6.xht
@@ -1102,7 +1102,7 @@
       <tr id="style-attr-cascade-004-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1110,7 +1110,7 @@
       <tr id="style-attr-cascade-005-6.4.1" class="">
         <td>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
@@ -1222,7 +1222,7 @@
       <tr id="style-attr-cascade-004-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></strong></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. important tag selectors
         </td>
@@ -1230,7 +1230,7 @@
       <tr id="style-attr-cascade-005-6.4.2" class="primary">
         <td><strong>
             <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></strong></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td></td>
         <td>CSS: style attribute vs. tag selectors (interleaved importance)
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-9.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-9.xht
index 94ac484d674..06511988a70 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-9.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-9.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model (1246 tests)</h2>
+  <h2>Visual formatting model (1245 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1338,7 +1338,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.2.2">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">9.2.2 Inline-level elements and inline boxes</a></th></tr>
-      <!-- 20 tests -->
+      <!-- 19 tests -->
       <tr id="inline-block-alignment-002-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-002.xht">inline-block-alignment-002</a></td>
@@ -1397,7 +1397,7 @@
       <tr id="inline-block-alignment-007-9.2.2" class="ahem">
         <td>
             <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>inline block alignment - alphabetical alignment with vertical layout
           <ul class="assert">
@@ -1416,17 +1416,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="inline-block-alignment-009-9.2.2" class="ahem">
-        <td>
-            <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="inlines-002-9.2.2" class="primary">
         <td><strong>
             <a href="inlines-002.xht">inlines-002</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-000.xht
index ed49c5d5304..20e8621b337 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors"/>
+  <link rel="match" href="reference/descendant-selector-000-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply each rule to the descendant elements"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-001.xht
index 386eb9a72b9..51f0fbb12d2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendant-selector-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors"/>
+  <link rel="match" href="reference/descendant-selector-000-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply each rule to the descendant elements"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-002.xht
index 2fabc8dd174..9a384e7cd80 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-002.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied only to descendents." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-003.xht
index 274a0e8f0bf..6d8617fc773 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-003.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied to descendents even if additional elements separate parent and subject of selector." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-004.xht
index cd6b13ecd47..5bace60864f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-004.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Descendent selectors are applied only to descendents where the parent element matches." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-006.xht
index 8b182218245..ddfaee41dc9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/descendent-selector-006.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Grandchild selection is applied only to elements which have grandchildren." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-000.xht
index 0dd6ab0d067..5b37ed6024c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-000.xht
@@ -13,6 +13,8 @@
 </style>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping"/>
+  <link rel="match" href="reference/grouping-000-ref.xht"/>
+  <link rel="mismatch" href="reference/grouping-000-notref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Browsers should apply the rule to all elements grouped"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-001.xht
index 45592c90d76..9f08ad02f5a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-001.xht
@@ -13,6 +13,8 @@
 </style>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping"/>
+  <link rel="match" href="reference/grouping-000-ref.xht"/>
+  <link rel="mismatch" href="reference/grouping-000-notref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Browsers should ignore an invalid grouping"/>
 <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-002.xht
index a5c11f84f11..23fef57f6aa 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/grouping-002.xht
@@ -13,6 +13,8 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#grouping" />
+        <link rel="match" href="reference/grouping-002-ref.xht" />
+        <link rel="mismatch" href="reference/grouping-002-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Selectors can be condensed into a single selector." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-007.xht
index 78766bb21eb..1e0f85d049b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-007.xht
@@ -12,16 +12,15 @@
           }
 </style>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
     <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-007-ref.xht" />
+    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr-sideways
     {
-      color: aqua;
+      color: fuchsia;
       font: 60px/1 Ahem; /* computes to 60px/60px */
       height: 4em;
       writing-mode: vertical-lr;
@@ -59,7 +58,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
 
   <div id="lr-sideways">É<div id="inline-block">
     <span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-009.xht
deleted file mode 100644
index 8fb04b1f10b..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/inline-block-alignment-009.xht
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-009"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-009-ref.xht" />
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#lr-sideways-right
-    {
-      color: olive;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-lr;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="lr-sideways-right">p<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">p</span>
-  </div><span id="fuchsia30">p</span></div>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/left-offset-position-fixed-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/left-offset-position-fixed-001.xht
index a8fcdcdb8c1..a7b638b9dd3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/left-offset-position-fixed-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/left-offset-position-fixed-001.xht
@@ -12,7 +12,7 @@
           }
 </style>
     <link rel="author" title="Chris Rebert" href="http://chrisrebert.com"/>
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>  <!-- 2015-09-17 -->
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#position-props" title="9.3.2 Box offsets: 'top', 'right', 'bottom', 'left'"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements"/>
     <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#position-props"/>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht
new file mode 100644
index 00000000000..f340157883d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test descendant-selector-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.orange {
+  border: thin solid orange;
+}
+.blue {
+  border: thin solid blue;
+}
+.fuchsia {
+  border: thin solid fuchsia;
+}
+</style>
+</head>
+<body>
+<p class="orange">This paragraph should have a thin orange border.</p>
+<div><p class="blue">This paragraph should have a thin blue border.</p></div>
+<h4><span class="fuchsia">This text should have a thin fuchsia border.</span></h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht
new file mode 100644
index 00000000000..4344078cee6
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test descendent-selector-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht
new file mode 100644
index 00000000000..0cde035e176
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test descendent-selector-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if there is no red visible on the page.</p>
+<div><em>Filler Text</em></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-notref.xht
new file mode 100644
index 00000000000..dd77e45ea63
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-notref.xht
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test grouping-000-notref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-ref.xht
new file mode 100644
index 00000000000..8427a0d3e4c
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-000-ref.xht
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test grouping-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+  font-weight: bold;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<div>This text should be green.</div>
+<h4>This text should be green.</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-notref.xht
new file mode 100644
index 00000000000..ccd2819e9f2
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-notref.xht
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test grouping-002-notref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-ref.xht
new file mode 100644
index 00000000000..bc53cc6a980
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/grouping-002-ref.xht
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test grouping-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+blockquote {
+  color: green;
+}
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote>Filler Text</blockquote>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
deleted file mode 100644
index 102226731ad..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-007-ref"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
deleted file mode 100644
index 78d5e34e9d7..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>CSS Reftest Reference</title>
-  <style type="text/css">
-    @page { font: italic 8pt sans-serif; color: gray;
-            margin: 7%;
-            counter-increment: page;
-            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
-            @top-right { content: "Test inline-block-alignment-009-ref"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-  <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-  <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-  <meta name="flags" content="image" />
-  <style type="text/css"><![CDATA[
-  img
-  {
-   vertical-align: top;
-  }
-
-  img
-  {
-   padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
-  }
-
-  img + br + img
-  {
-   padding-left: 60px; /* 60 px (padding-left) */
-  }
-
-  img + br + img + br + img
-  {
-   padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
-  }
-  ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div>
-    <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled" /><br /><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled" />
-  </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-green-background.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-green-background.xht
index 0129c4c596a..d5df2f6fcd8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-green-background.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-green-background.xht
@@ -1,11 +1,25 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Reference</title>
-<link href="http://www.intel.com" rel="author" title="Intel" />
-<style>
-  div { background-color: green; color: white; }
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test ref-green-background"; }
+            @bottom-right { content: counter(page); }
+          }
 </style>
-</head><body>
-  <div>This should be white on green.</div>
-
-</body></html>
\ No newline at end of file
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This should have a green background.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht
new file mode 100644
index 00000000000..0129c4c596a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+<style>
+  div { background-color: green; color: white; }
+</style>
+</head><body>
+  <div>This should be white on green.</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/type-selector-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/type-selector-001-ref.xht
new file mode 100644
index 00000000000..af209a86a88
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/type-selector-001-ref.xht
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test type-selector-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.green {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<blockquote class="green">Filler Text</blockquote>
+<div class="green">Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht
new file mode 100644
index 00000000000..dd1fd67cebd
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test universal-selector-001-notref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht
new file mode 100644
index 00000000000..3e7123bd810
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test universal-selector-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if all text on this page is green.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht
new file mode 100644
index 00000000000..76831a1d6a1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test universal-selector-002-notref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht
new file mode 100644
index 00000000000..65cea7e4acf
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test universal-selector-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  color: green;
+}
+</style>
+</head>
+<body>
+<div>Filler Text</div>
+<p>Test passes if the "Filler Text" above is green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-005-ref.xht
new file mode 100644
index 00000000000..244ec7f5786
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/universal-selector-005-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS 2.1 Conformance Test Suite"; }
+            @top-right { content: "Test universal-selector-005-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  margin-left: 100px;
+}
+li {
+  list-style-image: url("support/cat.png");
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a <strong>cat image</strong>.</p>
+<ul>
+  <li>&nbsp;</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
index d55178a4e65..f875917afe3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
@@ -24172,6 +24172,22 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendant-selector-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors">
+          <a href="descendant-selector-000.xht">descendant-selector-000</a></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendant-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Descendant selectors and universal selector">
+          <a href="descendant-selector-001.xht">descendant-selector-001</a></td>
+        <td><a href="reference/descendant-selector-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-001" class="">
       <tr>
         <td rowspan="1" title="Descendent selector does not apply to parent element">
@@ -24180,6 +24196,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector">
+          <a href="descendent-selector-002.xht">descendent-selector-002</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-003" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with additional element between">
+          <a href="descendent-selector-003.xht">descendent-selector-003</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-004" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with incorrect parent element">
+          <a href="descendent-selector-004.xht">descendent-selector-004</a></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="descendent-selector-005" class="">
       <tr>
         <td rowspan="1" title="Grandchild selection with no children">
@@ -24188,6 +24228,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="descendent-selector-006" class="">
+      <tr>
+        <td rowspan="1" title="Grandchild selection with no grandchildren">
+          <a href="descendent-selector-006.xht">descendent-selector-006</a></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="direction-001" class="">
       <tr>
         <td rowspan="1" title="Direction set to 'ltr'">
@@ -28188,6 +28236,30 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="grouping-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping">
+          <a href="grouping-000.xht">grouping-000</a></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Selectors: Grouping: Invalid grouping">
+          <a href="grouping-001.xht">grouping-001</a></td>
+        <td><a href="reference/grouping-000-ref.xht">=</a> <a href="reference/grouping-000-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="grouping-002" class="">
+      <tr>
+        <td rowspan="1" title="Condensing selectors">
+          <a href="grouping-002.xht">grouping-002</a></td>
+        <td><a href="reference/grouping-002-ref.xht">=</a> <a href="reference/grouping-002-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Height using pixels with a minimum minus one value, -1px">
@@ -29376,7 +29448,7 @@
       <tr>
         <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
           <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td>
-        <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td>
+        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
@@ -29388,14 +29460,6 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="inline-block-alignment-009" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-009.xht">inline-block-alignment-009</a></td>
-        <td><a href="reference/inline-block-alignment-009-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
     <tbody id="inline-block-height-001" class="">
       <tr>
         <td rowspan="1" title="Test for height:auto on inline-block">
@@ -43835,7 +43899,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. important tag selectors">
           <a href="style-attr-cascade-004.xht">style-attr-cascade-004</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -43843,7 +43907,7 @@
       <tr>
         <td rowspan="1" title="CSS: style attribute vs. tag selectors (interleaved importance)">
           <a href="style-attr-cascade-005.xht">style-attr-cascade-005</a></td>
-        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td><a href="reference/ref-white-on-green-background.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
@@ -44935,6 +44999,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="type-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Type selectors">
+          <a href="type-selector-001.xht">type-selector-001</a></td>
+        <td><a href="reference/type-selector-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="unicode-bidi-001" class="">
       <tr>
         <td rowspan="1" title="Unicode-bidi set to 'normal'">
@@ -45135,6 +45207,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Universal selector">
+          <a href="universal-selector-001.xht">universal-selector-001</a></td>
+        <td><a href="reference/universal-selector-001-ref.xht">=</a> <a href="reference/universal-selector-001-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="universal-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Implied universal selector for pseudo selector">
+          <a href="universal-selector-002.xht">universal-selector-002</a></td>
+        <td><a href="reference/universal-selector-002-ref.xht">=</a> <a href="reference/universal-selector-002-notref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="universal-selector-003" class="">
       <tr>
         <td rowspan="1" title="Implied universal selector for class selector">
@@ -45151,6 +45239,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="universal-selector-005" class="image">
+      <tr>
+        <td rowspan="1" title="universal selector - list-style-image">
+          <a href="universal-selector-005.xht">universal-selector-005</a></td>
+        <td><a href="reference/universal-selector-005-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="unterminated-string-001" class="invalid">
       <tr>
         <td rowspan="1" title="Error handling of unterminated strings">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
index 9da679f3f17..1b1534f1a45 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
@@ -3028,8 +3028,14 @@ delete-inline-in-blocks-middle-002.xht == reference/delete-inline-in-blocks-midd
 delete-inline-in-blocks-middle-003.xht == reference/delete-inline-in-blocks-middle-002-ref.xht
 descendant-display-none-001.xht == reference/ref-if-there-is-no-red.xht
 descendant-display-override-001.xht == reference/ref-if-there-is-no-red.xht
+descendant-selector-000.xht == reference/descendant-selector-000-ref.xht
+descendant-selector-001.xht == reference/descendant-selector-000-ref.xht
 descendent-selector-001.xht == reference/no-red-filler-text-ref.xht
+descendent-selector-002.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-003.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-004.xht == reference/descendent-selector-004-ref.xht
 descendent-selector-005.xht == reference/no-red-filler-text-ref.xht
+descendent-selector-006.xht == reference/descendent-selector-004-ref.xht
 direction-001.xht == reference/direction-001-ref.xht
 direction-002.xht == reference/direction-002-ref.xht
 direction-003.xht == reference/direction-002-ref.xht
@@ -3530,6 +3536,9 @@ grid-float-001.xht == reference/ref-filled-green-100px-square.xht
 grid-inline-float-001.xht == reference/ref-filled-green-100px-square.xht
 grid-inline-vertical-align-001.xht == reference/ref-filled-green-100px-square.xht
 grid-vertical-align-001.xht == reference/ref-filled-green-100px-square.xht
+grouping-000.xht == reference/grouping-000-ref.xht != reference/grouping-000-notref.xht
+grouping-001.xht == reference/grouping-000-ref.xht != reference/grouping-000-notref.xht
+grouping-002.xht == reference/grouping-002-ref.xht != reference/grouping-002-notref.xht
 height-001.xht == reference/height-001-ref.xht
 height-002.xht == reference/height-001-ref.xht
 height-003.xht == reference/height-003-ref.xht
@@ -3679,9 +3688,8 @@ inline-block-alignment-003.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht
 inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-007.xht == reference/inline-block-alignment-007-ref.xht
+inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-009.xht == reference/inline-block-alignment-009-ref.xht
 inline-block-height-001.xht == reference/inline-block-height-001-ref.xht
 inline-block-height-002.xht == reference/inline-block-height-002-ref.xht
 inline-block-non-replaced-height-001.xht == reference/height-percentage-001-ref.xht
@@ -5488,8 +5496,8 @@ strings-000.xht == reference/ref-this-text-should-be-green.xht
 style-attr-cascade-001.xht == reference/ref-green.xht
 style-attr-cascade-002.xht == reference/ref-green.xht
 style-attr-cascade-003.xht == reference/ref-green.xht
-style-attr-cascade-004.xht == reference/ref-green-background.xht
-style-attr-cascade-005.xht == reference/ref-green-background.xht
+style-attr-cascade-004.xht == reference/ref-white-on-green-background.xht
+style-attr-cascade-005.xht == reference/ref-white-on-green-background.xht
 style-attr-cascade-006.xht == reference/ref-green.xht
 style-attr-cascade-007.xht == reference/style-attr-cascade-007.xht
 style-attr-specificity-001.xht == reference/ref-green-on-green.xht
@@ -5626,6 +5634,7 @@ top-offset-002.xht == reference/bottom-offset-001-ref.xht
 top-offset-003.xht == reference/top-offset-003-ref.xht
 top-offset-percentage-001.xht == reference/top-offset-percentage-001-ref.xht
 top-offset-percentage-002.xht == reference/left-offset-percentage-002-ref.xht
+type-selector-001.xht == reference/type-selector-001-ref.xht
 unicode-bidi-001.xht == reference/direction-002-ref.xht
 unicode-bidi-002.xht == reference/unicode-bidi-002-ref.xht
 unicode-bidi-003.xht == reference/direction-002-ref.xht
@@ -5651,8 +5660,11 @@ units-005.xht == reference/units-005-ref.xht
 units-006.xht == reference/units-006-ref.xht
 units-008.xht == reference/units-006-ref.xht
 units-009.xht == reference/units-006-ref.xht
+universal-selector-001.xht == reference/universal-selector-001-ref.xht != reference/universal-selector-001-notref.xht
+universal-selector-002.xht == reference/universal-selector-002-ref.xht != reference/universal-selector-002-notref.xht
 universal-selector-003.xht == reference/filler-text-below-green.xht
 universal-selector-004.xht == reference/filler-text-below-green.xht
+universal-selector-005.xht == reference/universal-selector-005-ref.xht
 unterminated-string-001.xht == reference/filler-text-below-green.xht
 uri-001.xht == reference/filler-text-below-green.xht
 uri-002.xht == reference/no-red-filler-text-ref.xht
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-004.xht
index 3939ffb8758..4a1eb87d2e1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-004.xht
@@ -17,7 +17,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: green ! important; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-005.xht
index a0a9fe472a0..662dd361c4a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/style-attr-cascade-005.xht
@@ -17,7 +17,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#important-rules"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order"/>
   <link rel="help" href="http://www.w3.org/TR/css-style-attr/#interpret"/>
-  <link rel="match" href="reference/ref-green-background.xht"/>
+  <link rel="match" href="reference/ref-white-on-green-background.xht"/>
   <style type="text/css">
    div { color: white ! important; background: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
index 973e73cf8b3..57bbd468bfc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
@@ -62,7 +62,7 @@
     <tbody id="s9">
       <tr><th><a href="chapter-9.xht">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1246 Tests)</td></tr>
+      <td>(1245 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.xht">Chapter 10 - 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/type-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/type-selector-001.xht
index 81ebfade954..ae882acda0c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/type-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/type-selector-001.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#type-selectors" />
+        <link rel="match" href="reference/type-selector-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Basic type selectors apply to each type." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-001.xht
index 3436a2d6a67..1bf4a1134ba 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-001.xht
@@ -13,6 +13,8 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
+        <link rel="match" href="reference/universal-selector-001-ref.xht" />
+        <link rel="mismatch" href="reference/universal-selector-001-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The universal selector applies to all elements." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-002.xht
index dcbe7e26e86..8cc256d22bc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-002.xht
@@ -13,6 +13,8 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
+        <link rel="match" href="reference/universal-selector-002-ref.xht" />
+        <link rel="mismatch" href="reference/universal-selector-002-notref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="If the universal selector is not the only component of a simple pseudo selector the '*' can be omitted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-005.xht
index 6ca9026ef5d..db8ceebf65b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/universal-selector-005.xht
@@ -20,6 +20,7 @@
   <link rel="author" title="Alexander Dawson" href="alexander_dawson(a)hotmail.com" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#universal-selector" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image" />
+  <link rel="match" href="reference/universal-selector-005-ref.xht" />
   <meta name="flags" content="image" />
   <meta name="assert" content="The universal selector matches the name of any element type. 'list-style-image' applies to elements with 'display: list-item'." />
 
diff --git a/tests/wpt/css-tests/source_rev b/tests/wpt/css-tests/source_rev
index 67ccf9486a9..be07b6c7100 100644
--- a/tests/wpt/css-tests/source_rev
+++ b/tests/wpt/css-tests/source_rev
@@ -1 +1 @@
-b9960b65a927b8e829096848066b004fc4e31737
\ No newline at end of file
+26ca14789a81d7668e6291b436d30eb1dfcd8063
\ No newline at end of file
diff --git a/tests/wpt/metadata-css/MANIFEST.json b/tests/wpt/metadata-css/MANIFEST.json
index 341b060744c..55f7a7227e3 100644
--- a/tests/wpt/metadata-css/MANIFEST.json
+++ b/tests/wpt/metadata-css/MANIFEST.json
@@ -1151,6 +1151,16 @@
         ],
         "url": "/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm"
       },
+      {
+        "path": "css-backgrounds-3_dev/html4/background-repeat-round.htm",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/html4/reference/background-repeat-round.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/html4/background-repeat-round.htm"
+      },
       {
         "path": "css-backgrounds-3_dev/html4/background-repeat-space.htm",
         "references": [
@@ -2311,6 +2321,16 @@
         ],
         "url": "/css-backgrounds-3_dev/html4/border-radius-horizontal-value-is-zero.htm"
       },
+      {
+        "path": "css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm"
+      },
       {
         "path": "css-backgrounds-3_dev/html4/border-top-left-radius-001.htm",
         "references": [
@@ -2512,14 +2532,14 @@
         "url": "/css-backgrounds-3_dev/html4/border-top-right-radius-014.htm"
       },
       {
-        "path": "css-backgrounds-3_dev/html4/box-shadow-001.htm",
+        "path": "css-backgrounds-3_dev/html4/box-shadow-005.htm",
         "references": [
           [
-            "/css-backgrounds-3_dev/html4/reference/box-shadow-001-ref.htm",
+            "/css-backgrounds-3_dev/html4/reference/box-shadow-005-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/html4/box-shadow-001.htm"
+        "url": "/css-backgrounds-3_dev/html4/box-shadow-005.htm"
       },
       {
         "path": "css-backgrounds-3_dev/html4/box-shadow-inset-spread-without-border-radius.htm",
@@ -3541,6 +3561,16 @@
         ],
         "url": "/css-backgrounds-3_dev/xhtml1/background-repeat-round-roundup.xht"
       },
+      {
+        "path": "css-backgrounds-3_dev/xhtml1/background-repeat-round.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1/reference/background-repeat-round.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht"
+      },
       {
         "path": "css-backgrounds-3_dev/xhtml1/background-repeat-space.xht",
         "references": [
@@ -4571,6 +4601,16 @@
         ],
         "url": "/css-backgrounds-3_dev/xhtml1/border-radius-horizontal-value-is-zero.xht"
       },
+      {
+        "path": "css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht"
+      },
       {
         "path": "css-backgrounds-3_dev/xhtml1/border-top-left-radius-001.xht",
         "references": [
@@ -4772,14 +4812,14 @@
         "url": "/css-backgrounds-3_dev/xhtml1/border-top-right-radius-014.xht"
       },
       {
-        "path": "css-backgrounds-3_dev/xhtml1/box-shadow-001.xht",
+        "path": "css-backgrounds-3_dev/xhtml1/box-shadow-005.xht",
         "references": [
           [
-            "/css-backgrounds-3_dev/xhtml1/reference/box-shadow-001-ref.xht",
+            "/css-backgrounds-3_dev/xhtml1/reference/box-shadow-005-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht"
+        "url": "/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht"
       },
       {
         "path": "css-backgrounds-3_dev/xhtml1/box-shadow-inset-spread-without-border-radius.xht",
@@ -5801,6 +5841,16 @@
         ],
         "url": "/css-backgrounds-3_dev/xhtml1print/background-repeat-round-roundup.xht"
       },
+      {
+        "path": "css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1print/reference/background-repeat-round.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht"
+      },
       {
         "path": "css-backgrounds-3_dev/xhtml1print/background-repeat-space.xht",
         "references": [
@@ -6831,6 +6881,16 @@
         ],
         "url": "/css-backgrounds-3_dev/xhtml1print/border-radius-horizontal-value-is-zero.xht"
       },
+      {
+        "path": "css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht"
+      },
       {
         "path": "css-backgrounds-3_dev/xhtml1print/border-top-left-radius-001.xht",
         "references": [
@@ -7032,14 +7092,14 @@
         "url": "/css-backgrounds-3_dev/xhtml1print/border-top-right-radius-014.xht"
       },
       {
-        "path": "css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht",
+        "path": "css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht",
         "references": [
           [
-            "/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-001-ref.xht",
+            "/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-005-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht"
+        "url": "/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht"
       },
       {
         "path": "css-backgrounds-3_dev/xhtml1print/box-shadow-inset-spread-without-border-radius.xht",
@@ -28415,7 +28475,7 @@
         "path": "css-fonts-3_dev/html/font-size-adjust-007.htm",
         "references": [
           [
-            "/css-fonts-3_dev/html/reference/ref-if-there-is-no-red.htm",
+            "/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm",
             "=="
           ]
         ],
@@ -29815,7 +29875,7 @@
         "path": "css-fonts-3_dev/xhtml1/font-size-adjust-007.xht",
         "references": [
           [
-            "/css-fonts-3_dev/xhtml1/reference/ref-if-there-is-no-red.xht",
+            "/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht",
             "=="
           ]
         ],
@@ -31195,7 +31255,7 @@
         "path": "css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht",
         "references": [
           [
-            "/css-fonts-3_dev/xhtml1print/reference/ref-if-there-is-no-red.xht",
+            "/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht",
             "=="
           ]
         ],
@@ -55167,7 +55227,7 @@
         "path": "css-style-attr-1_dev/html4/style-attr-cascade-004.htm",
         "references": [
           [
-            "/css-style-attr-1_dev/html4/reference/ref-green-background.htm",
+            "/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -55177,7 +55237,7 @@
         "path": "css-style-attr-1_dev/html4/style-attr-cascade-005.htm",
         "references": [
           [
-            "/css-style-attr-1_dev/html4/reference/ref-green-background.htm",
+            "/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -55317,7 +55377,7 @@
         "path": "css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -55327,7 +55387,7 @@
         "path": "css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -55477,7 +55537,7 @@
         "path": "css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -55487,7 +55547,7 @@
         "path": "css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -74381,6 +74441,16 @@
         ],
         "url": "/css-text-decor-3_dev/html/text-decoration-propagation-01.htm"
       },
+      {
+        "path": "css-text-decor-3_dev/html/text-emphasis-style-001.htm",
+        "references": [
+          [
+            "/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/html/text-emphasis-style-001.htm"
+      },
       {
         "path": "css-text-decor-3_dev/html/text-emphasis-style-002.htm",
         "references": [
@@ -74511,6 +74581,16 @@
         ],
         "url": "/css-text-decor-3_dev/xhtml1/text-decoration-propagation-01.xht"
       },
+      {
+        "path": "css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht",
+        "references": [
+          [
+            "/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht"
+      },
       {
         "path": "css-text-decor-3_dev/xhtml1/text-emphasis-style-002.xht",
         "references": [
@@ -74641,6 +74721,16 @@
         ],
         "url": "/css-text-decor-3_dev/xhtml1print/text-decoration-propagation-01.xht"
       },
+      {
+        "path": "css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht",
+        "references": [
+          [
+            "/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht"
+      },
       {
         "path": "css-text-decor-3_dev/xhtml1print/text-emphasis-style-002.xht",
         "references": [
@@ -118787,7 +118877,7 @@
         "path": "css-writing-modes-3_dev/html/inline-block-alignment-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-006-ref.htm",
             "=="
           ]
         ],
@@ -118803,16 +118893,6 @@
         ],
         "url": "/css-writing-modes-3_dev/html/inline-block-alignment-008.htm"
       },
-      {
-        "path": "css-writing-modes-3_dev/html/inline-block-alignment-009.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/inline-block-alignment-009.htm"
-      },
       {
         "path": "css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm",
         "references": [
@@ -119587,7 +119667,7 @@
         "path": "css-writing-modes-3_dev/html/table-progression-001-vlr.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm",
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -119597,12 +119677,72 @@
         "path": "css-writing-modes-3_dev/html/table-progression-001-vrl.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm",
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/html/table-progression-001-vrl.htm"
       },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-002-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-002-vlr.htm"
+      },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-002-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-002-vrl.htm"
+      },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-003-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-003-vlr.htm"
+      },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-003-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-003-vrl.htm"
+      },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-004-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-004-vlr.htm"
+      },
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-004-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-004-vrl.htm"
+      },
       {
         "path": "css-writing-modes-3_dev/html/text-align-vlr-003.htm",
         "references": [
@@ -119837,32 +119977,12 @@
         "path": "css-writing-modes-3_dev/html/text-baseline-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/html/text-baseline-007.htm"
       },
-      {
-        "path": "css-writing-modes-3_dev/html/text-baseline-008.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/text-baseline-008.htm"
-      },
-      {
-        "path": "css-writing-modes-3_dev/html/text-baseline-009.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/text-baseline-009.htm"
-      },
       {
         "path": "css-writing-modes-3_dev/html/text-combine-upright-decorations-001.htm",
         "references": [
@@ -125825,7 +125945,7 @@
         "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -125841,16 +125961,6 @@
         ],
         "url": "/css-writing-modes-3_dev/xhtml1/inline-block-alignment-008.xht"
       },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht"
-      },
       {
         "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht",
         "references": [
@@ -126315,7 +126425,7 @@
         "path": "css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -126325,12 +126435,72 @@
         "path": "css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht"
       },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht"
+      },
       {
         "path": "css-writing-modes-3_dev/xhtml1/text-align-vlr-003.xht",
         "references": [
@@ -126565,32 +126735,12 @@
         "path": "css-writing-modes-3_dev/xhtml1/text-baseline-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht"
       },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/text-baseline-008.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht"
-      },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/text-baseline-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht"
-      },
       {
         "path": "css-writing-modes-3_dev/xhtml1/text-combine-upright-decorations-001.xht",
         "references": [
@@ -132533,7 +132683,7 @@
         "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -132549,16 +132699,6 @@
         ],
         "url": "/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-008.xht"
       },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht"
-      },
       {
         "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht",
         "references": [
@@ -133023,7 +133163,7 @@
         "path": "css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -133033,12 +133173,72 @@
         "path": "css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht"
       },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht"
+      },
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht"
+      },
       {
         "path": "css-writing-modes-3_dev/xhtml1print/text-align-vlr-003.xht",
         "references": [
@@ -133273,32 +133473,12 @@
         "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht"
       },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht"
-      },
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht"
-      },
       {
         "path": "css-writing-modes-3_dev/xhtml1print/text-combine-upright-decorations-001.xht",
         "references": [
@@ -163901,6 +164081,26 @@
         ],
         "url": "/css21_dev/html4/descendant-display-override-001.htm"
       },
+      {
+        "path": "css21_dev/html4/descendant-selector-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendant-selector-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendant-selector-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/descendant-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendant-selector-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendant-selector-001.htm"
+      },
       {
         "path": "css21_dev/html4/descendent-selector-001.htm",
         "references": [
@@ -163911,6 +164111,36 @@
         ],
         "url": "/css21_dev/html4/descendent-selector-001.htm"
       },
+      {
+        "path": "css21_dev/html4/descendent-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/descendent-selector-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/descendent-selector-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-004.htm"
+      },
       {
         "path": "css21_dev/html4/descendent-selector-005.htm",
         "references": [
@@ -163921,6 +164151,16 @@
         ],
         "url": "/css21_dev/html4/descendent-selector-005.htm"
       },
+      {
+        "path": "css21_dev/html4/descendent-selector-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-006.htm"
+      },
       {
         "path": "css21_dev/html4/direction-001.htm",
         "references": [
@@ -168897,6 +169137,48 @@
         ],
         "url": "/css21_dev/html4/grid-vertical-align-001.htm"
       },
+      {
+        "path": "css21_dev/html4/grouping-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-000-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-000-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/grouping-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-000-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-000-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/grouping-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-002-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-002-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-002.htm"
+      },
       {
         "path": "css21_dev/html4/height-001.htm",
         "references": [
@@ -170391,7 +170673,7 @@
         "path": "css21_dev/html4/inline-block-alignment-007.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/inline-block-alignment-007-ref.htm",
+            "/css21_dev/html4/reference/inline-block-alignment-006-ref.htm",
             "=="
           ]
         ],
@@ -170407,16 +170689,6 @@
         ],
         "url": "/css21_dev/html4/inline-block-alignment-008.htm"
       },
-      {
-        "path": "css21_dev/html4/inline-block-alignment-009.htm",
-        "references": [
-          [
-            "/css21_dev/html4/reference/inline-block-alignment-009-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/html4/inline-block-alignment-009.htm"
-      },
       {
         "path": "css21_dev/html4/inline-block-height-001.htm",
         "references": [
@@ -188583,7 +188855,7 @@
         "path": "css21_dev/html4/style-attr-cascade-004.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/ref-green-background.htm",
+            "/css21_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -188593,7 +188865,7 @@
         "path": "css21_dev/html4/style-attr-cascade-005.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/ref-green-background.htm",
+            "/css21_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -189967,6 +190239,16 @@
         ],
         "url": "/css21_dev/html4/top-offset-percentage-002.htm"
       },
+      {
+        "path": "css21_dev/html4/type-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/type-selector-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/type-selector-001.htm"
+      },
       {
         "path": "css21_dev/html4/unicode-bidi-001.htm",
         "references": [
@@ -190217,6 +190499,34 @@
         ],
         "url": "/css21_dev/html4/units-009.htm"
       },
+      {
+        "path": "css21_dev/html4/universal-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-001-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/universal-selector-001-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/universal-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-002-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/universal-selector-002-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-002.htm"
+      },
       {
         "path": "css21_dev/html4/universal-selector-003.htm",
         "references": [
@@ -190237,6 +190547,16 @@
         ],
         "url": "/css21_dev/html4/universal-selector-004.htm"
       },
+      {
+        "path": "css21_dev/html4/universal-selector-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-005.htm"
+      },
       {
         "path": "css21_dev/html4/unterminated-string-001.htm",
         "references": [
@@ -222495,6 +222815,26 @@
         ],
         "url": "/css21_dev/xhtml1/descendant-display-override-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/descendant-selector-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendant-selector-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/descendant-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendant-selector-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/descendent-selector-001.xht",
         "references": [
@@ -222505,6 +222845,36 @@
         ],
         "url": "/css21_dev/xhtml1/descendent-selector-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1/descendent-selector-005.xht",
         "references": [
@@ -222515,6 +222885,16 @@
         ],
         "url": "/css21_dev/xhtml1/descendent-selector-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1/direction-001.xht",
         "references": [
@@ -227291,6 +227671,48 @@
         ],
         "url": "/css21_dev/xhtml1/grid-vertical-align-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/grouping-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/grouping-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/grouping-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/height-001.xht",
         "references": [
@@ -228775,7 +229197,7 @@
         "path": "css21_dev/xhtml1/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht",
+            "/css21_dev/xhtml1/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -228791,16 +229213,6 @@
         ],
         "url": "/css21_dev/xhtml1/inline-block-alignment-008.xht"
       },
-      {
-        "path": "css21_dev/xhtml1/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/xhtml1/inline-block-alignment-009.xht"
-      },
       {
         "path": "css21_dev/xhtml1/inline-block-height-001.xht",
         "references": [
@@ -246857,7 +247269,7 @@
         "path": "css21_dev/xhtml1/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -246867,7 +247279,7 @@
         "path": "css21_dev/xhtml1/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -248221,6 +248633,16 @@
         ],
         "url": "/css21_dev/xhtml1/top-offset-percentage-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/type-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/type-selector-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/type-selector-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/unicode-bidi-001.xht",
         "references": [
@@ -248461,6 +248883,34 @@
         ],
         "url": "/css21_dev/xhtml1/units-009.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/universal-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-001-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-001-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/universal-selector-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/universal-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/universal-selector-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/universal-selector-003.xht",
         "references": [
@@ -280719,6 +281169,26 @@
         ],
         "url": "/css21_dev/xhtml1print/descendant-display-override-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/descendant-selector-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendant-selector-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/descendant-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendant-selector-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/descendent-selector-001.xht",
         "references": [
@@ -280729,6 +281199,36 @@
         ],
         "url": "/css21_dev/xhtml1print/descendent-selector-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/descendent-selector-005.xht",
         "references": [
@@ -280739,6 +281239,16 @@
         ],
         "url": "/css21_dev/xhtml1print/descendent-selector-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/direction-001.xht",
         "references": [
@@ -285515,6 +286025,48 @@
         ],
         "url": "/css21_dev/xhtml1print/grid-vertical-align-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/grouping-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/grouping-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/grouping-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/height-001.xht",
         "references": [
@@ -286999,7 +287551,7 @@
         "path": "css21_dev/xhtml1print/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht",
+            "/css21_dev/xhtml1print/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -287015,16 +287567,6 @@
         ],
         "url": "/css21_dev/xhtml1print/inline-block-alignment-008.xht"
       },
-      {
-        "path": "css21_dev/xhtml1print/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/xhtml1print/inline-block-alignment-009.xht"
-      },
       {
         "path": "css21_dev/xhtml1print/inline-block-height-001.xht",
         "references": [
@@ -305081,7 +305623,7 @@
         "path": "css21_dev/xhtml1print/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -305091,7 +305633,7 @@
         "path": "css21_dev/xhtml1print/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -306445,6 +306987,16 @@
         ],
         "url": "/css21_dev/xhtml1print/top-offset-percentage-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/type-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/type-selector-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/type-selector-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/unicode-bidi-001.xht",
         "references": [
@@ -306685,6 +307237,34 @@
         ],
         "url": "/css21_dev/xhtml1print/units-009.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/universal-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/universal-selector-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/universal-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/universal-selector-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/universal-selector-003.xht",
         "references": [
@@ -316223,6 +316803,18 @@
         "url": "/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm"
       }
     ],
+    "css-backgrounds-3_dev/html4/background-repeat-round.htm": [
+      {
+        "path": "css-backgrounds-3_dev/html4/background-repeat-round.htm",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/html4/reference/background-repeat-round.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/html4/background-repeat-round.htm"
+      }
+    ],
     "css-backgrounds-3_dev/html4/background-repeat-space.htm": [
       {
         "path": "css-backgrounds-3_dev/html4/background-repeat-space.htm",
@@ -317615,6 +318207,18 @@
         "url": "/css-backgrounds-3_dev/html4/border-radius-horizontal-value-is-zero.htm"
       }
     ],
+    "css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm": [
+      {
+        "path": "css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/html4/reference/border-radius-shorthand-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/html4/border-radius-shorthand-002.htm"
+      }
+    ],
     "css-backgrounds-3_dev/html4/border-top-left-radius-001.htm": [
       {
         "path": "css-backgrounds-3_dev/html4/border-top-left-radius-001.htm",
@@ -317855,16 +318459,16 @@
         "url": "/css-backgrounds-3_dev/html4/border-top-right-radius-014.htm"
       }
     ],
-    "css-backgrounds-3_dev/html4/box-shadow-001.htm": [
+    "css-backgrounds-3_dev/html4/box-shadow-005.htm": [
       {
-        "path": "css-backgrounds-3_dev/html4/box-shadow-001.htm",
+        "path": "css-backgrounds-3_dev/html4/box-shadow-005.htm",
         "references": [
           [
-            "/css-backgrounds-3_dev/html4/reference/box-shadow-001-ref.htm",
+            "/css-backgrounds-3_dev/html4/reference/box-shadow-005-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/html4/box-shadow-001.htm"
+        "url": "/css-backgrounds-3_dev/html4/box-shadow-005.htm"
       }
     ],
     "css-backgrounds-3_dev/html4/box-shadow-inset-spread-without-border-radius.htm": [
@@ -319091,6 +319695,18 @@
         "url": "/css-backgrounds-3_dev/xhtml1/background-repeat-round-roundup.xht"
       }
     ],
+    "css-backgrounds-3_dev/xhtml1/background-repeat-round.xht": [
+      {
+        "path": "css-backgrounds-3_dev/xhtml1/background-repeat-round.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1/reference/background-repeat-round.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1/background-repeat-round.xht"
+      }
+    ],
     "css-backgrounds-3_dev/xhtml1/background-repeat-space.xht": [
       {
         "path": "css-backgrounds-3_dev/xhtml1/background-repeat-space.xht",
@@ -320327,6 +320943,18 @@
         "url": "/css-backgrounds-3_dev/xhtml1/border-radius-horizontal-value-is-zero.xht"
       }
     ],
+    "css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht": [
+      {
+        "path": "css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1/reference/border-radius-shorthand-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1/border-radius-shorthand-002.xht"
+      }
+    ],
     "css-backgrounds-3_dev/xhtml1/border-top-left-radius-001.xht": [
       {
         "path": "css-backgrounds-3_dev/xhtml1/border-top-left-radius-001.xht",
@@ -320567,16 +321195,16 @@
         "url": "/css-backgrounds-3_dev/xhtml1/border-top-right-radius-014.xht"
       }
     ],
-    "css-backgrounds-3_dev/xhtml1/box-shadow-001.xht": [
+    "css-backgrounds-3_dev/xhtml1/box-shadow-005.xht": [
       {
-        "path": "css-backgrounds-3_dev/xhtml1/box-shadow-001.xht",
+        "path": "css-backgrounds-3_dev/xhtml1/box-shadow-005.xht",
         "references": [
           [
-            "/css-backgrounds-3_dev/xhtml1/reference/box-shadow-001-ref.xht",
+            "/css-backgrounds-3_dev/xhtml1/reference/box-shadow-005-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/xhtml1/box-shadow-001.xht"
+        "url": "/css-backgrounds-3_dev/xhtml1/box-shadow-005.xht"
       }
     ],
     "css-backgrounds-3_dev/xhtml1/box-shadow-inset-spread-without-border-radius.xht": [
@@ -321803,6 +322431,18 @@
         "url": "/css-backgrounds-3_dev/xhtml1print/background-repeat-round-roundup.xht"
       }
     ],
+    "css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht": [
+      {
+        "path": "css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1print/reference/background-repeat-round.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1print/background-repeat-round.xht"
+      }
+    ],
     "css-backgrounds-3_dev/xhtml1print/background-repeat-space.xht": [
       {
         "path": "css-backgrounds-3_dev/xhtml1print/background-repeat-space.xht",
@@ -323039,6 +323679,18 @@
         "url": "/css-backgrounds-3_dev/xhtml1print/border-radius-horizontal-value-is-zero.xht"
       }
     ],
+    "css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht": [
+      {
+        "path": "css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht",
+        "references": [
+          [
+            "/css-backgrounds-3_dev/xhtml1print/reference/border-radius-shorthand-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-backgrounds-3_dev/xhtml1print/border-radius-shorthand-002.xht"
+      }
+    ],
     "css-backgrounds-3_dev/xhtml1print/border-top-left-radius-001.xht": [
       {
         "path": "css-backgrounds-3_dev/xhtml1print/border-top-left-radius-001.xht",
@@ -323279,16 +323931,16 @@
         "url": "/css-backgrounds-3_dev/xhtml1print/border-top-right-radius-014.xht"
       }
     ],
-    "css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht": [
+    "css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht": [
       {
-        "path": "css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht",
+        "path": "css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht",
         "references": [
           [
-            "/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-001-ref.xht",
+            "/css-backgrounds-3_dev/xhtml1print/reference/box-shadow-005-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-backgrounds-3_dev/xhtml1print/box-shadow-001.xht"
+        "url": "/css-backgrounds-3_dev/xhtml1print/box-shadow-005.xht"
       }
     ],
     "css-backgrounds-3_dev/xhtml1print/box-shadow-inset-spread-without-border-radius.xht": [
@@ -348940,7 +349592,7 @@
         "path": "css-fonts-3_dev/html/font-size-adjust-007.htm",
         "references": [
           [
-            "/css-fonts-3_dev/html/reference/ref-if-there-is-no-red.htm",
+            "/css-fonts-3_dev/html/reference/ref-filled-green-100px-square.htm",
             "=="
           ]
         ],
@@ -350620,7 +351272,7 @@
         "path": "css-fonts-3_dev/xhtml1/font-size-adjust-007.xht",
         "references": [
           [
-            "/css-fonts-3_dev/xhtml1/reference/ref-if-there-is-no-red.xht",
+            "/css-fonts-3_dev/xhtml1/reference/ref-filled-green-100px-square.xht",
             "=="
           ]
         ],
@@ -352276,7 +352928,7 @@
         "path": "css-fonts-3_dev/xhtml1print/font-size-adjust-007.xht",
         "references": [
           [
-            "/css-fonts-3_dev/xhtml1print/reference/ref-if-there-is-no-red.xht",
+            "/css-fonts-3_dev/xhtml1print/reference/ref-filled-green-100px-square.xht",
             "=="
           ]
         ],
@@ -381040,7 +381692,7 @@
         "path": "css-style-attr-1_dev/html4/style-attr-cascade-004.htm",
         "references": [
           [
-            "/css-style-attr-1_dev/html4/reference/ref-green-background.htm",
+            "/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -381052,7 +381704,7 @@
         "path": "css-style-attr-1_dev/html4/style-attr-cascade-005.htm",
         "references": [
           [
-            "/css-style-attr-1_dev/html4/reference/ref-green-background.htm",
+            "/css-style-attr-1_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -381220,7 +381872,7 @@
         "path": "css-style-attr-1_dev/xhtml1/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -381232,7 +381884,7 @@
         "path": "css-style-attr-1_dev/xhtml1/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -381412,7 +382064,7 @@
         "path": "css-style-attr-1_dev/xhtml1print/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -381424,7 +382076,7 @@
         "path": "css-style-attr-1_dev/xhtml1print/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css-style-attr-1_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css-style-attr-1_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -404087,6 +404739,18 @@
         "url": "/css-text-decor-3_dev/html/text-decoration-propagation-01.htm"
       }
     ],
+    "css-text-decor-3_dev/html/text-emphasis-style-001.htm": [
+      {
+        "path": "css-text-decor-3_dev/html/text-emphasis-style-001.htm",
+        "references": [
+          [
+            "/css-text-decor-3_dev/html/reference/text-emphasis-style-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/html/text-emphasis-style-001.htm"
+      }
+    ],
     "css-text-decor-3_dev/html/text-emphasis-style-002.htm": [
       {
         "path": "css-text-decor-3_dev/html/text-emphasis-style-002.htm",
@@ -404243,6 +404907,18 @@
         "url": "/css-text-decor-3_dev/xhtml1/text-decoration-propagation-01.xht"
       }
     ],
+    "css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht": [
+      {
+        "path": "css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht",
+        "references": [
+          [
+            "/css-text-decor-3_dev/xhtml1/reference/text-emphasis-style-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/xhtml1/text-emphasis-style-001.xht"
+      }
+    ],
     "css-text-decor-3_dev/xhtml1/text-emphasis-style-002.xht": [
       {
         "path": "css-text-decor-3_dev/xhtml1/text-emphasis-style-002.xht",
@@ -404399,6 +405075,18 @@
         "url": "/css-text-decor-3_dev/xhtml1print/text-decoration-propagation-01.xht"
       }
     ],
+    "css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht": [
+      {
+        "path": "css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht",
+        "references": [
+          [
+            "/css-text-decor-3_dev/xhtml1print/reference/text-emphasis-style-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-text-decor-3_dev/xhtml1print/text-emphasis-style-001.xht"
+      }
+    ],
     "css-text-decor-3_dev/xhtml1print/text-emphasis-style-002.xht": [
       {
         "path": "css-text-decor-3_dev/xhtml1print/text-emphasis-style-002.xht",
@@ -457216,7 +457904,7 @@
         "path": "css-writing-modes-3_dev/html/inline-block-alignment-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-006-ref.htm",
             "=="
           ]
         ],
@@ -457235,18 +457923,6 @@
         "url": "/css-writing-modes-3_dev/html/inline-block-alignment-008.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/inline-block-alignment-009.htm": [
-      {
-        "path": "css-writing-modes-3_dev/html/inline-block-alignment-009.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/inline-block-alignment-009.htm"
-      }
-    ],
     "css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm": [
       {
         "path": "css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm",
@@ -458176,7 +458852,7 @@
         "path": "css-writing-modes-3_dev/html/table-progression-001-vlr.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm",
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -458188,13 +458864,85 @@
         "path": "css-writing-modes-3_dev/html/table-progression-001-vrl.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm",
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/html/table-progression-001-vrl.htm"
       }
     ],
+    "css-writing-modes-3_dev/html/table-progression-002-vlr.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-002-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-002-vlr.htm"
+      }
+    ],
+    "css-writing-modes-3_dev/html/table-progression-002-vrl.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-002-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-002-vrl.htm"
+      }
+    ],
+    "css-writing-modes-3_dev/html/table-progression-003-vlr.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-003-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-003-vlr.htm"
+      }
+    ],
+    "css-writing-modes-3_dev/html/table-progression-003-vrl.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-003-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-003-vrl.htm"
+      }
+    ],
+    "css-writing-modes-3_dev/html/table-progression-004-vlr.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-004-vlr.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-004-vlr.htm"
+      }
+    ],
+    "css-writing-modes-3_dev/html/table-progression-004-vrl.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/table-progression-004-vrl.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/table-progression-004-vrl.htm"
+      }
+    ],
     "css-writing-modes-3_dev/html/text-align-vlr-003.htm": [
       {
         "path": "css-writing-modes-3_dev/html/text-align-vlr-003.htm",
@@ -458476,37 +459224,13 @@
         "path": "css-writing-modes-3_dev/html/text-baseline-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/html/text-baseline-007.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/text-baseline-008.htm": [
-      {
-        "path": "css-writing-modes-3_dev/html/text-baseline-008.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/text-baseline-008.htm"
-      }
-    ],
-    "css-writing-modes-3_dev/html/text-baseline-009.htm": [
-      {
-        "path": "css-writing-modes-3_dev/html/text-baseline-009.htm",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/html/reference/text-baseline-006-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/html/text-baseline-009.htm"
-      }
-    ],
     "css-writing-modes-3_dev/html/text-combine-upright-decorations-001.htm": [
       {
         "path": "css-writing-modes-3_dev/html/text-combine-upright-decorations-001.htm",
@@ -465648,7 +466372,7 @@
         "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -465667,18 +466391,6 @@
         "url": "/css-writing-modes-3_dev/xhtml1/inline-block-alignment-008.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht"
-      }
-    ],
     "css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht",
@@ -466236,7 +466948,7 @@
         "path": "css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -466248,13 +466960,85 @@
         "path": "css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht"
       }
     ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht"
+      }
+    ],
     "css-writing-modes-3_dev/xhtml1/text-align-vlr-003.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1/text-align-vlr-003.xht",
@@ -466536,37 +467320,13 @@
         "path": "css-writing-modes-3_dev/xhtml1/text-baseline-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/text-baseline-008.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/text-baseline-008.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht"
-      }
-    ],
-    "css-writing-modes-3_dev/xhtml1/text-baseline-009.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1/text-baseline-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht"
-      }
-    ],
     "css-writing-modes-3_dev/xhtml1/text-combine-upright-decorations-001.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1/text-combine-upright-decorations-001.xht",
@@ -473684,7 +474444,7 @@
         "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -473703,18 +474463,6 @@
         "url": "/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-008.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/inline-block-alignment-009.xht"
-      }
-    ],
     "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1print/inline-block-alignment-orthogonal-vlr-003.xht",
@@ -474272,7 +475020,7 @@
         "path": "css-writing-modes-3_dev/xhtml1print/table-progression-001-vlr.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
@@ -474284,13 +475032,85 @@
         "path": "css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/table-progression-001-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-001-vrl.xht"
       }
     ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-002-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-002-vrl.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-003-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-001-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-003-vrl.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-004-vlr.xht"
+      }
+    ],
+    "css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht": [
+      {
+        "path": "css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/xhtml1print/table-progression-002-ref.orngtml",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/xhtml1print/table-progression-004-vrl.xht"
+      }
+    ],
     "css-writing-modes-3_dev/xhtml1print/text-align-vlr-003.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1print/text-align-vlr-003.xht",
@@ -474572,37 +475392,13 @@
         "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-007-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
             "=="
           ]
         ],
         "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-007.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-008.xht"
-      }
-    ],
-    "css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht": [
-      {
-        "path": "css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht",
-        "references": [
-          [
-            "/css-writing-modes-3_dev/xhtml1print/reference/text-baseline-006-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/text-baseline-009.xht"
-      }
-    ],
     "css-writing-modes-3_dev/xhtml1print/text-combine-upright-decorations-001.xht": [
       {
         "path": "css-writing-modes-3_dev/xhtml1print/text-combine-upright-decorations-001.xht",
@@ -511307,6 +512103,30 @@
         "url": "/css21_dev/html4/descendant-display-override-001.htm"
       }
     ],
+    "css21_dev/html4/descendant-selector-000.htm": [
+      {
+        "path": "css21_dev/html4/descendant-selector-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendant-selector-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendant-selector-000.htm"
+      }
+    ],
+    "css21_dev/html4/descendant-selector-001.htm": [
+      {
+        "path": "css21_dev/html4/descendant-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendant-selector-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendant-selector-001.htm"
+      }
+    ],
     "css21_dev/html4/descendent-selector-001.htm": [
       {
         "path": "css21_dev/html4/descendent-selector-001.htm",
@@ -511319,6 +512139,42 @@
         "url": "/css21_dev/html4/descendent-selector-001.htm"
       }
     ],
+    "css21_dev/html4/descendent-selector-002.htm": [
+      {
+        "path": "css21_dev/html4/descendent-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-002.htm"
+      }
+    ],
+    "css21_dev/html4/descendent-selector-003.htm": [
+      {
+        "path": "css21_dev/html4/descendent-selector-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-003.htm"
+      }
+    ],
+    "css21_dev/html4/descendent-selector-004.htm": [
+      {
+        "path": "css21_dev/html4/descendent-selector-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-004.htm"
+      }
+    ],
     "css21_dev/html4/descendent-selector-005.htm": [
       {
         "path": "css21_dev/html4/descendent-selector-005.htm",
@@ -511331,6 +512187,18 @@
         "url": "/css21_dev/html4/descendent-selector-005.htm"
       }
     ],
+    "css21_dev/html4/descendent-selector-006.htm": [
+      {
+        "path": "css21_dev/html4/descendent-selector-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/descendent-selector-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/descendent-selector-006.htm"
+      }
+    ],
     "css21_dev/html4/direction-001.htm": [
       {
         "path": "css21_dev/html4/direction-001.htm",
@@ -517299,6 +518167,54 @@
         "url": "/css21_dev/html4/grid-vertical-align-001.htm"
       }
     ],
+    "css21_dev/html4/grouping-000.htm": [
+      {
+        "path": "css21_dev/html4/grouping-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-000-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-000-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-000.htm"
+      }
+    ],
+    "css21_dev/html4/grouping-001.htm": [
+      {
+        "path": "css21_dev/html4/grouping-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-000-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-000-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-001.htm"
+      }
+    ],
+    "css21_dev/html4/grouping-002.htm": [
+      {
+        "path": "css21_dev/html4/grouping-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/grouping-002-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/grouping-002-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/grouping-002.htm"
+      }
+    ],
     "css21_dev/html4/height-001.htm": [
       {
         "path": "css21_dev/html4/height-001.htm",
@@ -519092,7 +520008,7 @@
         "path": "css21_dev/html4/inline-block-alignment-007.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/inline-block-alignment-007-ref.htm",
+            "/css21_dev/html4/reference/inline-block-alignment-006-ref.htm",
             "=="
           ]
         ],
@@ -519111,18 +520027,6 @@
         "url": "/css21_dev/html4/inline-block-alignment-008.htm"
       }
     ],
-    "css21_dev/html4/inline-block-alignment-009.htm": [
-      {
-        "path": "css21_dev/html4/inline-block-alignment-009.htm",
-        "references": [
-          [
-            "/css21_dev/html4/reference/inline-block-alignment-009-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/html4/inline-block-alignment-009.htm"
-      }
-    ],
     "css21_dev/html4/inline-block-height-001.htm": [
       {
         "path": "css21_dev/html4/inline-block-height-001.htm",
@@ -541244,7 +542148,7 @@
         "path": "css21_dev/html4/style-attr-cascade-004.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/ref-green-background.htm",
+            "/css21_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -541256,7 +542160,7 @@
         "path": "css21_dev/html4/style-attr-cascade-005.htm",
         "references": [
           [
-            "/css21_dev/html4/reference/ref-green-background.htm",
+            "/css21_dev/html4/reference/ref-white-on-green-background.htm",
             "=="
           ]
         ],
@@ -542903,6 +543807,18 @@
         "url": "/css21_dev/html4/top-offset-percentage-002.htm"
       }
     ],
+    "css21_dev/html4/type-selector-001.htm": [
+      {
+        "path": "css21_dev/html4/type-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/type-selector-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/type-selector-001.htm"
+      }
+    ],
     "css21_dev/html4/unicode-bidi-001.htm": [
       {
         "path": "css21_dev/html4/unicode-bidi-001.htm",
@@ -543203,6 +544119,38 @@
         "url": "/css21_dev/html4/units-009.htm"
       }
     ],
+    "css21_dev/html4/universal-selector-001.htm": [
+      {
+        "path": "css21_dev/html4/universal-selector-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-001-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/universal-selector-001-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-001.htm"
+      }
+    ],
+    "css21_dev/html4/universal-selector-002.htm": [
+      {
+        "path": "css21_dev/html4/universal-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-002-ref.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/universal-selector-002-notref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-002.htm"
+      }
+    ],
     "css21_dev/html4/universal-selector-003.htm": [
       {
         "path": "css21_dev/html4/universal-selector-003.htm",
@@ -543227,6 +544175,18 @@
         "url": "/css21_dev/html4/universal-selector-004.htm"
       }
     ],
+    "css21_dev/html4/universal-selector-005.htm": [
+      {
+        "path": "css21_dev/html4/universal-selector-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/universal-selector-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/universal-selector-005.htm"
+      }
+    ],
     "css21_dev/html4/unterminated-string-001.htm": [
       {
         "path": "css21_dev/html4/unterminated-string-001.htm",
@@ -581927,6 +582887,30 @@
         "url": "/css21_dev/xhtml1/descendant-display-override-001.xht"
       }
     ],
+    "css21_dev/xhtml1/descendant-selector-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendant-selector-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendant-selector-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/descendant-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendant-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendant-selector-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/descendent-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1/descendent-selector-001.xht",
@@ -581939,6 +582923,42 @@
         "url": "/css21_dev/xhtml1/descendent-selector-001.xht"
       }
     ],
+    "css21_dev/xhtml1/descendent-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/descendent-selector-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/descendent-selector-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-004.xht"
+      }
+    ],
     "css21_dev/xhtml1/descendent-selector-005.xht": [
       {
         "path": "css21_dev/xhtml1/descendent-selector-005.xht",
@@ -581951,6 +582971,18 @@
         "url": "/css21_dev/xhtml1/descendent-selector-005.xht"
       }
     ],
+    "css21_dev/xhtml1/descendent-selector-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/descendent-selector-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/descendent-selector-006.xht"
+      }
+    ],
     "css21_dev/xhtml1/direction-001.xht": [
       {
         "path": "css21_dev/xhtml1/direction-001.xht",
@@ -587679,6 +588711,54 @@
         "url": "/css21_dev/xhtml1/grid-vertical-align-001.xht"
       }
     ],
+    "css21_dev/xhtml1/grouping-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/grouping-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/grouping-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/grouping-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/grouping-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/grouping-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/grouping-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/grouping-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/grouping-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/height-001.xht": [
       {
         "path": "css21_dev/xhtml1/height-001.xht",
@@ -589460,7 +590540,7 @@
         "path": "css21_dev/xhtml1/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/inline-block-alignment-007-ref.xht",
+            "/css21_dev/xhtml1/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -589479,18 +590559,6 @@
         "url": "/css21_dev/xhtml1/inline-block-alignment-008.xht"
       }
     ],
-    "css21_dev/xhtml1/inline-block-alignment-009.xht": [
-      {
-        "path": "css21_dev/xhtml1/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css21_dev/xhtml1/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/xhtml1/inline-block-alignment-009.xht"
-      }
-    ],
     "css21_dev/xhtml1/inline-block-height-001.xht": [
       {
         "path": "css21_dev/xhtml1/inline-block-height-001.xht",
@@ -611480,7 +612548,7 @@
         "path": "css21_dev/xhtml1/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -611492,7 +612560,7 @@
         "path": "css21_dev/xhtml1/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -613115,6 +614183,18 @@
         "url": "/css21_dev/xhtml1/top-offset-percentage-002.xht"
       }
     ],
+    "css21_dev/xhtml1/type-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/type-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/type-selector-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/type-selector-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/unicode-bidi-001.xht": [
       {
         "path": "css21_dev/xhtml1/unicode-bidi-001.xht",
@@ -613403,6 +614483,38 @@
         "url": "/css21_dev/xhtml1/units-009.xht"
       }
     ],
+    "css21_dev/xhtml1/universal-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/universal-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-001-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-001-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/universal-selector-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/universal-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/universal-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/universal-selector-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/universal-selector-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/universal-selector-003.xht": [
       {
         "path": "css21_dev/xhtml1/universal-selector-003.xht",
@@ -652103,6 +653215,30 @@
         "url": "/css21_dev/xhtml1print/descendant-display-override-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/descendant-selector-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendant-selector-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendant-selector-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/descendant-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendant-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendant-selector-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendant-selector-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/descendent-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1print/descendent-selector-001.xht",
@@ -652115,6 +653251,42 @@
         "url": "/css21_dev/xhtml1print/descendent-selector-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/descendent-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/descendent-selector-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/descendent-selector-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-004.xht"
+      }
+    ],
     "css21_dev/xhtml1print/descendent-selector-005.xht": [
       {
         "path": "css21_dev/xhtml1print/descendent-selector-005.xht",
@@ -652127,6 +653299,18 @@
         "url": "/css21_dev/xhtml1print/descendent-selector-005.xht"
       }
     ],
+    "css21_dev/xhtml1print/descendent-selector-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/descendent-selector-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/descendent-selector-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/descendent-selector-006.xht"
+      }
+    ],
     "css21_dev/xhtml1print/direction-001.xht": [
       {
         "path": "css21_dev/xhtml1print/direction-001.xht",
@@ -657855,6 +659039,54 @@
         "url": "/css21_dev/xhtml1print/grid-vertical-align-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/grouping-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/grouping-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/grouping-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/grouping-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-000-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/grouping-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/grouping-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/grouping-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/grouping-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/grouping-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/height-001.xht": [
       {
         "path": "css21_dev/xhtml1print/height-001.xht",
@@ -659636,7 +660868,7 @@
         "path": "css21_dev/xhtml1print/inline-block-alignment-007.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/inline-block-alignment-007-ref.xht",
+            "/css21_dev/xhtml1print/reference/inline-block-alignment-006-ref.xht",
             "=="
           ]
         ],
@@ -659655,18 +660887,6 @@
         "url": "/css21_dev/xhtml1print/inline-block-alignment-008.xht"
       }
     ],
-    "css21_dev/xhtml1print/inline-block-alignment-009.xht": [
-      {
-        "path": "css21_dev/xhtml1print/inline-block-alignment-009.xht",
-        "references": [
-          [
-            "/css21_dev/xhtml1print/reference/inline-block-alignment-009-ref.xht",
-            "=="
-          ]
-        ],
-        "url": "/css21_dev/xhtml1print/inline-block-alignment-009.xht"
-      }
-    ],
     "css21_dev/xhtml1print/inline-block-height-001.xht": [
       {
         "path": "css21_dev/xhtml1print/inline-block-height-001.xht",
@@ -681656,7 +682876,7 @@
         "path": "css21_dev/xhtml1print/style-attr-cascade-004.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -681668,7 +682888,7 @@
         "path": "css21_dev/xhtml1print/style-attr-cascade-005.xht",
         "references": [
           [
-            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "/css21_dev/xhtml1print/reference/ref-white-on-green-background.xht",
             "=="
           ]
         ],
@@ -683291,6 +684511,18 @@
         "url": "/css21_dev/xhtml1print/top-offset-percentage-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/type-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/type-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/type-selector-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/type-selector-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/unicode-bidi-001.xht": [
       {
         "path": "css21_dev/xhtml1print/unicode-bidi-001.xht",
@@ -683579,6 +684811,38 @@
         "url": "/css21_dev/xhtml1print/units-009.xht"
       }
     ],
+    "css21_dev/xhtml1print/universal-selector-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/universal-selector-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-001-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-001-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/universal-selector-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/universal-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/universal-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-002-ref.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/universal-selector-002-notref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/universal-selector-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/universal-selector-003.xht": [
       {
         "path": "css21_dev/xhtml1print/universal-selector-003.xht",
@@ -687180,7 +688444,7 @@
       }
     ]
   },
-  "rev": "135b269a1d9f5ce7862ab7426578bd56e2add740",
+  "rev": "939546644b4d333218fd9c2c0f68c60752ff1e95",
   "url_base": "/",
   "version": 2
 }
\ No newline at end of file
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-071.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-071.htm.ini
deleted file mode 100644
index 400c427ab8a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-071.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-071.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-072.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-072.htm.ini
deleted file mode 100644
index f3e0b3c2463..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-072.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-072.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-073.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-073.htm.ini
deleted file mode 100644
index 559917da7da..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-073.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-073.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-074.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-074.htm.ini
deleted file mode 100644
index 0694ee3c7b6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-074.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-074.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-075.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-075.htm.ini
deleted file mode 100644
index 32e20eb7798..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-075.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-075.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-076.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-076.htm.ini
deleted file mode 100644
index 1c80e456cc8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-076.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-076.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-077.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-077.htm.ini
deleted file mode 100644
index 771ee98072e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/at-charset-077.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[at-charset-077.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-000.htm.ini
deleted file mode 100644
index e78dd40db84..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-000.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[case-sensitive-000.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-001.htm.ini
deleted file mode 100644
index bfaa0d95cac..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[case-sensitive-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-001.htm.ini
deleted file mode 100644
index d8d53a28b6d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-002.htm.ini
deleted file mode 100644
index b07e963de1e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-003.htm.ini
deleted file mode 100644
index ff2ca42edc8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-004.htm.ini
deleted file mode 100644
index 04e559012fc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-005.htm.ini
deleted file mode 100644
index ee64f4bfe46..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-006.htm.ini
deleted file mode 100644
index c43262f554c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-007.htm.ini
deleted file mode 100644
index 9c60f52481b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-008.htm.ini
deleted file mode 100644
index d87e5123528..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/escapes-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/escapes-014.htm.ini
deleted file mode 100644
index 95bd4e77104..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/escapes-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[escapes-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-alignment-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-alignment-009.htm.ini
deleted file mode 100644
index 9c557550103..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-alignment-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-alignment-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/keywords-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/keywords-000.htm.ini
deleted file mode 100644
index 1ad40b55e1e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/keywords-000.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[keywords-000.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/uri-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/uri-015.htm.ini
deleted file mode 100644
index 0246546b1f4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/uri-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[uri-015.htm]
-  type: reftest
-  expected: FAIL